summaryrefslogtreecommitdiffstats
path: root/drivers/input
diff options
context:
space:
mode:
authorDmitry Torokhov <dmitry.torokhov@gmail.com>2013-06-11 01:10:07 -0400
committerDmitry Torokhov <dmitry.torokhov@gmail.com>2013-06-19 01:56:52 -0400
commitf9f6def88ace892f9f90f639664f0e203bafdb22 (patch)
tree6f33fd883837aba1177f5d36f29bdc4a4bc0539a /drivers/input
parente4156979c7d34e5197b16fa31c1c7549eae675e5 (diff)
Input: pxa27x-keypad - convert to using SIMPLE_DEV_PM_OPS
Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Diffstat (limited to 'drivers/input')
-rw-r--r--drivers/input/keyboard/pxa27x_keypad.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/input/keyboard/pxa27x_keypad.c b/drivers/input/keyboard/pxa27x_keypad.c
index 533fd6c7c3c8..aa17cf269aa8 100644
--- a/drivers/input/keyboard/pxa27x_keypad.c
+++ b/drivers/input/keyboard/pxa27x_keypad.c
@@ -661,7 +661,7 @@ static void pxa27x_keypad_close(struct input_dev *dev)
661 clk_disable_unprepare(keypad->clk); 661 clk_disable_unprepare(keypad->clk);
662} 662}
663 663
664#ifdef CONFIG_PM 664#ifdef CONFIG_PM_SLEEP
665static int pxa27x_keypad_suspend(struct device *dev) 665static int pxa27x_keypad_suspend(struct device *dev)
666{ 666{
667 struct platform_device *pdev = to_platform_device(dev); 667 struct platform_device *pdev = to_platform_device(dev);
@@ -705,13 +705,12 @@ static int pxa27x_keypad_resume(struct device *dev)
705 705
706 return 0; 706 return 0;
707} 707}
708
709static const struct dev_pm_ops pxa27x_keypad_pm_ops = {
710 .suspend = pxa27x_keypad_suspend,
711 .resume = pxa27x_keypad_resume,
712};
713#endif 708#endif
714 709
710static SIMPLE_DEV_PM_OPS(pxa27x_keypad_pm_ops,
711 pxa27x_keypad_suspend, pxa27x_keypad_resume);
712
713
715static int pxa27x_keypad_probe(struct platform_device *pdev) 714static int pxa27x_keypad_probe(struct platform_device *pdev)
716{ 715{
717 struct pxa27x_keypad_platform_data *pdata = pdev->dev.platform_data; 716 struct pxa27x_keypad_platform_data *pdata = pdev->dev.platform_data;
@@ -872,9 +871,7 @@ static struct platform_driver pxa27x_keypad_driver = {
872 .name = "pxa27x-keypad", 871 .name = "pxa27x-keypad",
873 .of_match_table = of_match_ptr(pxa27x_keypad_dt_match), 872 .of_match_table = of_match_ptr(pxa27x_keypad_dt_match),
874 .owner = THIS_MODULE, 873 .owner = THIS_MODULE,
875#ifdef CONFIG_PM
876 .pm = &pxa27x_keypad_pm_ops, 874 .pm = &pxa27x_keypad_pm_ops,
877#endif
878 }, 875 },
879}; 876};
880module_platform_driver(pxa27x_keypad_driver); 877module_platform_driver(pxa27x_keypad_driver);