diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-02-24 00:51:40 -0800 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-02-24 00:54:29 -0800 |
| commit | f3761c0779b62276b5bf84532a81d5dc49bd721f (patch) | |
| tree | fca99792f6dc66b9f55ec12dbf02d5841547f03b /drivers/input/misc | |
| parent | 02dfc496800dfaf17b650256642f3df86653fe97 (diff) | |
| download | blackbird-op-linux-f3761c0779b62276b5bf84532a81d5dc49bd721f.tar.gz blackbird-op-linux-f3761c0779b62276b5bf84532a81d5dc49bd721f.zip | |
Input: twl4030-vibra - use proper guard for PM methods
On m68k:
drivers/input/misc/twl4030-vibra.c:175:5: warning: "CONFIG_PM" is not
defined
We should use #ifdef instead of #if and also check CONFIG_PM_SLEEP
instead of CONFIG_PM.
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
Diffstat (limited to 'drivers/input/misc')
| -rw-r--r-- | drivers/input/misc/twl4030-vibra.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/input/misc/twl4030-vibra.c b/drivers/input/misc/twl4030-vibra.c index 37651373a95b..f3bc4189a7ba 100644 --- a/drivers/input/misc/twl4030-vibra.c +++ b/drivers/input/misc/twl4030-vibra.c @@ -172,7 +172,7 @@ static void twl4030_vibra_close(struct input_dev *input) } /*** Module ***/ -#if CONFIG_PM +#if CONFIG_PM_SLEEP static int twl4030_vibra_suspend(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); @@ -189,10 +189,10 @@ static int twl4030_vibra_resume(struct device *dev) vibra_disable_leds(); return 0; } +#endif static SIMPLE_DEV_PM_OPS(twl4030_vibra_pm_ops, twl4030_vibra_suspend, twl4030_vibra_resume); -#endif static int __devinit twl4030_vibra_probe(struct platform_device *pdev) { @@ -273,9 +273,7 @@ static struct platform_driver twl4030_vibra_driver = { .driver = { .name = "twl4030-vibra", .owner = THIS_MODULE, -#ifdef CONFIG_PM .pm = &twl4030_vibra_pm_ops, -#endif }, }; module_platform_driver(twl4030_vibra_driver); |
