diff options
| author | Ulf Hansson <ulf.hansson@linaro.org> | 2014-02-12 13:59:38 +0100 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2014-02-25 10:49:12 +0100 |
| commit | 131d85bc3aea81fbe35a30d6df0a6501b87294ed (patch) | |
| tree | d3f60d2e9220a00d6b718321504d5d716a4b5e79 /drivers/pinctrl/pinctrl-nomadik.c | |
| parent | 202909cdf117743bdbf8abc0f817950c8955c8cf (diff) | |
| download | linux-131d85bc3aea81fbe35a30d6df0a6501b87294ed.tar.bz2 | |
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>
Diffstat (limited to 'drivers/pinctrl/pinctrl-nomadik.c')
| -rw-r--r-- | drivers/pinctrl/pinctrl-nomadik.c | 4 |
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[] = { {}, }; +#ifdef CONFIG_PM_SLEEP static int nmk_pinctrl_suspend(struct platform_device *pdev, pm_message_t state) { struct nmk_pinctrl *npct; @@ -2056,6 +2057,7 @@ static int nmk_pinctrl_resume(struct platform_device *pdev) return pinctrl_force_default(npct->pctl); } +#endif 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, }, .probe = nmk_pinctrl_probe, -#ifdef CONFIG_PM +#ifdef CONFIG_PM_SLEEP .suspend = nmk_pinctrl_suspend, .resume = nmk_pinctrl_resume, #endif |