Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

pinctrl: nomadik: Silence compiler warn for !CONFIG_PM

The static suspend/resume functions were not being used while
!CONFIG_PM. Fix it and convert to CONFIG_PM_SLEEP.

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

authored by

Ulf Hansson and committed by
Linus Walleij
131d85bc 202909cd

+3 -1
+3 -1
drivers/pinctrl/pinctrl-nomadik.c
··· 2035 2035 {}, 2036 2036 }; 2037 2037 2038 + #ifdef CONFIG_PM_SLEEP 2038 2039 static int nmk_pinctrl_suspend(struct platform_device *pdev, pm_message_t state) 2039 2040 { 2040 2041 struct nmk_pinctrl *npct; ··· 2057 2056 2058 2057 return pinctrl_force_default(npct->pctl); 2059 2058 } 2059 + #endif 2060 2060 2061 2061 static int nmk_pinctrl_probe(struct platform_device *pdev) 2062 2062 { ··· 2153 2151 .of_match_table = nmk_pinctrl_match, 2154 2152 }, 2155 2153 .probe = nmk_pinctrl_probe, 2156 - #ifdef CONFIG_PM 2154 + #ifdef CONFIG_PM_SLEEP 2157 2155 .suspend = nmk_pinctrl_suspend, 2158 2156 .resume = nmk_pinctrl_resume, 2159 2157 #endif