lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Input: pxa27x_keypad - switch to using dev_pm_ops

Browse Source 
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Dmitry Torokhov
2009-07-24 22:01:43 -07:00
parent 633aae23ff
commit b0010911d5
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/input/keyboard/pxa27x_keypad.c
View File

@@ -389,8 +389,9 @@ static void pxa27x_keypad_close(struct input_dev *dev)
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int pxa27x_keypad_suspend(struct platform_device *pdev, pm_message_t state) static int pxa27x_keypad_suspend(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev);
struct pxa27x_keypad *keypad = platform_get_drvdata(pdev); struct pxa27x_keypad *keypad = platform_get_drvdata(pdev);
clk_disable(keypad->clk); clk_disable(keypad->clk);
@@ -401,8 +402,9 @@ static int pxa27x_keypad_suspend(struct platform_device *pdev, pm_message_t stat
return 0; return 0;
} }
static int pxa27x_keypad_resume(struct platform_device *pdev) static int pxa27x_keypad_resume(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev);
struct pxa27x_keypad *keypad = platform_get_drvdata(pdev); struct pxa27x_keypad *keypad = platform_get_drvdata(pdev);
struct input_dev *input_dev = keypad->input_dev; struct input_dev *input_dev = keypad->input_dev;
@@ -421,9 +423,11 @@ static int pxa27x_keypad_resume(struct platform_device *pdev)
return 0; return 0;
} }
#else
#define pxa27x_keypad_suspend NULL static const struct dev_pm_ops pxa27x_keypad_pm_ops = {
#define pxa27x_keypad_resume NULL .suspend = pxa27x_keypad_suspend,
.resume = pxa27x_keypad_resume,
};
#endif #endif
static int __devinit pxa27x_keypad_probe(struct platform_device *pdev) static int __devinit pxa27x_keypad_probe(struct platform_device *pdev)
@@ -572,11 +576,12 @@ MODULE_ALIAS("platform:pxa27x-keypad");
static struct platform_driver pxa27x_keypad_driver = { static struct platform_driver pxa27x_keypad_driver = {
.probe = pxa27x_keypad_probe, .probe = pxa27x_keypad_probe,
.remove = __devexit_p(pxa27x_keypad_remove), .remove = __devexit_p(pxa27x_keypad_remove),
.suspend = pxa27x_keypad_suspend,
.resume = pxa27x_keypad_resume,
.driver = { .driver = {
.name = "pxa27x-keypad", .name = "pxa27x-keypad",
.owner = THIS_MODULE, .owner = THIS_MODULE,
#ifdef CONFIG_PM
.pm = &pxa27x_keypad_pm_ops,
#endif
}, },
}; };