Merge branch 'core/irq_work' of git://git.kernel.org/pub/scm/linux/kernel/git/frederi...

[~andy/linux] / drivers / input / misc / pcf8574_keypad.c

diff --git a/drivers/input/misc/pcf8574_keypad.c b/drivers/input/misc/pcf8574_keypad.c
index 544c6635abe9a166aa91ff50b876fe36bba00b2d..e37392976fdd5f3f252ca5f2af2a2477fc8265b7 100644 (file)
--- a/drivers/input/misc/pcf8574_keypad.c
+++ b/drivers/input/misc/pcf8574_keypad.c
@@ -82,7 +82,7 @@ static irqreturn_t pcf8574_kp_irq_handler(int irq, void *dev_id)
        return IRQ_HANDLED;
 }
 
-static int __devinit pcf8574_kp_probe(struct i2c_client *client, const struct i2c_device_id *id)
+static int pcf8574_kp_probe(struct i2c_client *client, const struct i2c_device_id *id)
 {
        int i, ret;
        struct input_dev *idev;
@@ -156,7 +156,7 @@ static int __devinit pcf8574_kp_probe(struct i2c_client *client, const struct i2
        return ret;
 }
 
-static int __devexit pcf8574_kp_remove(struct i2c_client *client)
+static int pcf8574_kp_remove(struct i2c_client *client)
 {
        struct kp_data *lp = i2c_get_clientdata(client);
 
@@ -212,7 +212,7 @@ static struct i2c_driver pcf8574_kp_driver = {
 #endif
        },
        .probe    = pcf8574_kp_probe,
-       .remove   = __devexit_p(pcf8574_kp_remove),
+       .remove   = pcf8574_kp_remove,
        .id_table = pcf8574_kp_id,
 };