leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pinctrl: nomadik: Silence compiler warn for !CONFIG_PM

Browse Source 
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>
This commit is contained in:
Ulf Hansson 2014-02-12 13:59:38 +01:00 committed by Linus Walleij
parent 202909cdf1
commit 131d85bc3a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/pinctrl/pinctrl-nomadik.c
View File

@ -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)
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 = {
.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