]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
Input: imx_keypad - remove ifdef round PM methods
authorFabio Estevam <fabio.estevam@freescale.com>
Thu, 31 Jul 2014 18:57:08 +0000 (11:57 -0700)
committerDmitry Torokhov <dmitry.torokhov@gmail.com>
Thu, 31 Jul 2014 18:59:34 +0000 (11:59 -0700)
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>
drivers/input/keyboard/imx_keypad.c

index 8280cb16260be6f31840480ca3fd19a64bfffa1c..20a99c368d16f092aa60df47a481a8931d316100 100644 (file)
@@ -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);