aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUlf Hansson <ulf.hansson@linaro.org>2014-02-12 07:59:38 -0500
committerLinus Walleij <linus.walleij@linaro.org>2014-02-25 04:49:12 -0500
commit131d85bc3aea81fbe35a30d6df0a6501b87294ed (patch)
treed3f60d2e9220a00d6b718321504d5d716a4b5e79
parent202909cdf117743bdbf8abc0f817950c8955c8cf (diff)
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>
-rw-r--r--drivers/pinctrl/pinctrl-nomadik.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/pinctrl/pinctrl-nomadik.c b/drivers/pinctrl/pinctrl-nomadik.c
index 53a11114927f..b6c5793efb8d 100644
--- a/drivers/pinctrl/pinctrl-nomadik.c
+++ b/drivers/pinctrl/pinctrl-nomadik.c
@@ -2035,6 +2035,7 @@ static const struct of_device_id nmk_pinctrl_match[] = {
2035 {}, 2035 {},
2036}; 2036};
2037 2037
2038#ifdef CONFIG_PM_SLEEP
2038static int nmk_pinctrl_suspend(struct platform_device *pdev, pm_message_t state) 2039static int nmk_pinctrl_suspend(struct platform_device *pdev, pm_message_t state)
2039{ 2040{
2040 struct nmk_pinctrl *npct; 2041 struct nmk_pinctrl *npct;
@@ -2056,6 +2057,7 @@ static int nmk_pinctrl_resume(struct platform_device *pdev)
2056 2057
2057 return pinctrl_force_default(npct->pctl); 2058 return pinctrl_force_default(npct->pctl);
2058} 2059}
2060#endif
2059 2061
2060static int nmk_pinctrl_probe(struct platform_device *pdev) 2062static int nmk_pinctrl_probe(struct platform_device *pdev)
2061{ 2063{
@@ -2151,7 +2153,7 @@ static struct platform_driver nmk_pinctrl_driver = {
2151 .of_match_table = nmk_pinctrl_match, 2153 .of_match_table = nmk_pinctrl_match,
2152 }, 2154 },
2153 .probe = nmk_pinctrl_probe, 2155 .probe = nmk_pinctrl_probe,
2154#ifdef CONFIG_PM 2156#ifdef CONFIG_PM_SLEEP
2155 .suspend = nmk_pinctrl_suspend, 2157 .suspend = nmk_pinctrl_suspend,
2156 .resume = nmk_pinctrl_resume, 2158 .resume = nmk_pinctrl_resume,
2157#endif 2159#endif