diff options
author | Fabio Estevam <fabio.estevam@freescale.com> | 2014-07-31 14:57:08 -0400 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-07-31 14:59:34 -0400 |
commit | e179d5fa8d6dd0df62bc7ba2a6ee777f7d1142b5 (patch) | |
tree | e9a1ba8f3829e6541a7eb0a0cc45520d028d2a55 | |
parent | fe96244b6e0105126ae18e9727b295ca49a13f01 (diff) |
Input: imx_keypad - remove ifdef round PM methods
We can annotate the suspend/resume functions with '__maybe_unused' and get
rid of the ifdef, which makes the code smaller and simpler.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
-rw-r--r-- | drivers/input/keyboard/imx_keypad.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/input/keyboard/imx_keypad.c b/drivers/input/keyboard/imx_keypad.c index 8280cb16260b..20a99c368d16 100644 --- a/drivers/input/keyboard/imx_keypad.c +++ b/drivers/input/keyboard/imx_keypad.c | |||
@@ -531,8 +531,7 @@ static int imx_keypad_probe(struct platform_device *pdev) | |||
531 | return 0; | 531 | return 0; |
532 | } | 532 | } |
533 | 533 | ||
534 | #ifdef CONFIG_PM_SLEEP | 534 | static int __maybe_unused imx_kbd_suspend(struct device *dev) |
535 | static int imx_kbd_suspend(struct device *dev) | ||
536 | { | 535 | { |
537 | struct platform_device *pdev = to_platform_device(dev); | 536 | struct platform_device *pdev = to_platform_device(dev); |
538 | struct imx_keypad *kbd = platform_get_drvdata(pdev); | 537 | struct imx_keypad *kbd = platform_get_drvdata(pdev); |
@@ -552,7 +551,7 @@ static int imx_kbd_suspend(struct device *dev) | |||
552 | return 0; | 551 | return 0; |
553 | } | 552 | } |
554 | 553 | ||
555 | static int imx_kbd_resume(struct device *dev) | 554 | static int __maybe_unused imx_kbd_resume(struct device *dev) |
556 | { | 555 | { |
557 | struct platform_device *pdev = to_platform_device(dev); | 556 | struct platform_device *pdev = to_platform_device(dev); |
558 | struct imx_keypad *kbd = platform_get_drvdata(pdev); | 557 | struct imx_keypad *kbd = platform_get_drvdata(pdev); |
@@ -575,7 +574,6 @@ err_clk: | |||
575 | 574 | ||
576 | return ret; | 575 | return ret; |
577 | } | 576 | } |
578 | #endif | ||
579 | 577 | ||
580 | static SIMPLE_DEV_PM_OPS(imx_kbd_pm_ops, imx_kbd_suspend, imx_kbd_resume); | 578 | static SIMPLE_DEV_PM_OPS(imx_kbd_pm_ops, imx_kbd_suspend, imx_kbd_resume); |
581 | 579 | ||