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

Input: gpio_keys - swtich to dev_pm_ops

Browse Source 
Signed-off-by: Mike Rapoport <mike@compulab.co.il>
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Mike Rapoport
2009-07-22 23:02:54 -07:00
committed by Dmitry Torokhov
parent 8150f32b90
commit ae78e0e0e4
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/gpio_keys.c
View File

@@ -216,8 +216,9 @@ static int __devexit gpio_keys_remove(struct platform_device *pdev)
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int gpio_keys_suspend(struct platform_device *pdev, pm_message_t state) static int gpio_keys_suspend(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev);
struct gpio_keys_platform_data *pdata = pdev->dev.platform_data; struct gpio_keys_platform_data *pdata = pdev->dev.platform_data;
int i; int i;
@@ -234,8 +235,9 @@ static int gpio_keys_suspend(struct platform_device *pdev, pm_message_t state)
return 0; return 0;
} }
static int gpio_keys_resume(struct platform_device *pdev) static int gpio_keys_resume(struct device *dev)
{ {
struct platform_device *pdev = to_platform_device(dev);
struct gpio_keys_platform_data *pdata = pdev->dev.platform_data; struct gpio_keys_platform_data *pdata = pdev->dev.platform_data;
int i; int i;
@@ -251,19 +253,22 @@ static int gpio_keys_resume(struct platform_device *pdev)
return 0; return 0;
} }
#else
#define gpio_keys_suspend NULL static const struct dev_pm_ops gpio_keys_pm_ops = {
#define gpio_keys_resume NULL .suspend = gpio_keys_suspend,
.resume = gpio_keys_resume,
};
#endif #endif
static struct platform_driver gpio_keys_device_driver = { static struct platform_driver gpio_keys_device_driver = {
.probe = gpio_keys_probe, .probe = gpio_keys_probe,
.remove = __devexit_p(gpio_keys_remove), .remove = __devexit_p(gpio_keys_remove),
.suspend = gpio_keys_suspend,
.resume = gpio_keys_resume,
.driver = { .driver = {
.name = "gpio-keys", .name = "gpio-keys",
.owner = THIS_MODULE, .owner = THIS_MODULE,
#ifdef CONFIG_PM
.pm = &gpio_keys_pm_ops,
#endif
} }
}; };