Commit 131d85bc authored by Ulf Hansson's avatar Ulf Hansson Committed by Linus Walleij

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: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarLinus Walleij <linus.walleij@linaro.org>
parent 202909cd
...@@ -2035,6 +2035,7 @@ static const struct of_device_id nmk_pinctrl_match[] = { ...@@ -2035,6 +2035,7 @@ static const struct of_device_id nmk_pinctrl_match[] = {
{}, {},
}; };
#ifdef CONFIG_PM_SLEEP
static int nmk_pinctrl_suspend(struct platform_device *pdev, pm_message_t state) static int nmk_pinctrl_suspend(struct platform_device *pdev, pm_message_t state)
{ {
struct nmk_pinctrl *npct; struct nmk_pinctrl *npct;
...@@ -2056,6 +2057,7 @@ static int nmk_pinctrl_resume(struct platform_device *pdev) ...@@ -2056,6 +2057,7 @@ static int nmk_pinctrl_resume(struct platform_device *pdev)
return pinctrl_force_default(npct->pctl); return pinctrl_force_default(npct->pctl);
} }
#endif
static int nmk_pinctrl_probe(struct platform_device *pdev) static int nmk_pinctrl_probe(struct platform_device *pdev)
{ {
...@@ -2151,7 +2153,7 @@ static struct platform_driver nmk_pinctrl_driver = { ...@@ -2151,7 +2153,7 @@ static struct platform_driver nmk_pinctrl_driver = {
.of_match_table = nmk_pinctrl_match, .of_match_table = nmk_pinctrl_match,
}, },
.probe = nmk_pinctrl_probe, .probe = nmk_pinctrl_probe,
#ifdef CONFIG_PM #ifdef CONFIG_PM_SLEEP
.suspend = nmk_pinctrl_suspend, .suspend = nmk_pinctrl_suspend,
.resume = nmk_pinctrl_resume, .resume = nmk_pinctrl_resume,
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment