Skip to content

Commit

Permalink
Input: pcf_keypad - convert to dev_op_ops
Browse files Browse the repository at this point in the history
Signed-off-by: Dmitry Torokhov <dtor@mail.ru>
  • Loading branch information
Dmitry Torokhov committed Nov 12, 2010
1 parent 2a05915 commit 10ee2de
Showing 1 changed file with 15 additions and 4 deletions.
19 changes: 15 additions & 4 deletions drivers/input/misc/pcf8574_keypad.c
Original file line number Diff line number Diff line change
Expand Up @@ -169,19 +169,29 @@ static int __devexit pcf8574_kp_remove(struct i2c_client *client)
}

#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);

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);

return 0;
}

static const struct dev_pm_ops pcf8574_kp_pm_ops = {
.suspend = pcf8574_kp_suspend,
.resume = pcf8574_kp_resume,
};

#else
# define pcf8574_kp_resume NULL
# define pcf8574_kp_suspend NULL
Expand All @@ -197,11 +207,12 @@ static struct i2c_driver pcf8574_kp_driver = {
.driver = {
.name = DRV_NAME,
.owner = THIS_MODULE,
#ifdef CONFIG_PM
.pm = &pcf8574_kp_pm_ops,
#endif
},
.probe = pcf8574_kp_probe,
.remove = __devexit_p(pcf8574_kp_remove),
.suspend = pcf8574_kp_suspend,
.resume = pcf8574_kp_resume,
.id_table = pcf8574_kp_id,
};

Expand Down

0 comments on commit 10ee2de

Please sign in to comment.