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

Input: pcf_keypad - convert to dev_op_ops

Browse Source 
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
This commit is contained in:
Dmitry Torokhov
2010-11-11 01:03:00 -08:00
parent 2a0591596b
commit 10ee2ded62
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/input/misc/pcf8574_keypad.c
View File

@@ -169,19 +169,29 @@ static int __devexit pcf8574_kp_remove(struct i2c_client *client)
} }
#ifdef CONFIG_PM #ifdef CONFIG_PM
static int pcf8574_kp_resume(struct i2c_client *client) static int pcf8574_kp_resume(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev);
enable_irq(client->irq); enable_irq(client->irq);
return 0; return 0;
} }
static int pcf8574_kp_suspend(struct i2c_client *client, pm_message_t mesg) static int pcf8574_kp_suspend(struct device *dev)
{ {
struct i2c_client *client = to_i2c_client(dev);
disable_irq(client->irq); disable_irq(client->irq);
return 0; return 0;
} }
static const struct dev_pm_ops pcf8574_kp_pm_ops = {
.suspend = pcf8574_kp_suspend,
.resume = pcf8574_kp_resume,
};
#else #else
# define pcf8574_kp_resume NULL # define pcf8574_kp_resume NULL
# define pcf8574_kp_suspend NULL # define pcf8574_kp_suspend NULL
@@ -197,11 +207,12 @@ static struct i2c_driver pcf8574_kp_driver = {
.driver = { .driver = {
.name = DRV_NAME, .name = DRV_NAME,
.owner = THIS_MODULE, .owner = THIS_MODULE,
#ifdef CONFIG_PM
.pm = &pcf8574_kp_pm_ops,
#endif
}, },
.probe = pcf8574_kp_probe, .probe = pcf8574_kp_probe,
.remove = __devexit_p(pcf8574_kp_remove), .remove = __devexit_p(pcf8574_kp_remove),
.suspend = pcf8574_kp_suspend,
.resume = pcf8574_kp_resume,
.id_table = pcf8574_kp_id, .id_table = pcf8574_kp_id,
}; };