diff options
author | Fabio Estevam | 2014-07-31 20:57:08 +0200 |
---|---|---|
committer | Dmitry Torokhov | 2014-07-31 20:59:34 +0200 |
commit | e179d5fa8d6dd0df62bc7ba2a6ee777f7d1142b5 (patch) | |
tree | e9a1ba8f3829e6541a7eb0a0cc45520d028d2a55 | |
parent | Input: jornada720_ts - get rid of space indentation and use tab (diff) | |
download | kernel-qcow2-linux-e179d5fa8d6dd0df62bc7ba2a6ee777f7d1142b5.tar.gz kernel-qcow2-linux-e179d5fa8d6dd0df62bc7ba2a6ee777f7d1142b5.tar.xz kernel-qcow2-linux-e179d5fa8d6dd0df62bc7ba2a6ee777f7d1142b5.zip |
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) return 0; } -#ifdef CONFIG_PM_SLEEP -static int imx_kbd_suspend(struct device *dev) +static int __maybe_unused imx_kbd_suspend(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct imx_keypad *kbd = platform_get_drvdata(pdev); @@ -552,7 +551,7 @@ static int imx_kbd_suspend(struct device *dev) return 0; } -static int imx_kbd_resume(struct device *dev) +static int __maybe_unused imx_kbd_resume(struct device *dev) { struct platform_device *pdev = to_platform_device(dev); struct imx_keypad *kbd = platform_get_drvdata(pdev); @@ -575,7 +574,6 @@ err_clk: return ret; } -#endif static SIMPLE_DEV_PM_OPS(imx_kbd_pm_ops, imx_kbd_suspend, imx_kbd_resume); |