diff options
Diffstat (limited to 'drivers/input/keyboard/tca6416-keypad.c')
-rw-r--r-- | drivers/input/keyboard/tca6416-keypad.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/input/keyboard/tca6416-keypad.c b/drivers/input/keyboard/tca6416-keypad.c index c355cdde8d22..bfc832c35a7c 100644 --- a/drivers/input/keyboard/tca6416-keypad.c +++ b/drivers/input/keyboard/tca6416-keypad.c | |||
@@ -166,7 +166,7 @@ static void tca6416_keys_close(struct input_dev *dev) | |||
166 | disable_irq(chip->irqnum); | 166 | disable_irq(chip->irqnum); |
167 | } | 167 | } |
168 | 168 | ||
169 | static int __devinit tca6416_setup_registers(struct tca6416_keypad_chip *chip) | 169 | static int tca6416_setup_registers(struct tca6416_keypad_chip *chip) |
170 | { | 170 | { |
171 | int error; | 171 | int error; |
172 | 172 | ||
@@ -197,7 +197,7 @@ static int __devinit tca6416_setup_registers(struct tca6416_keypad_chip *chip) | |||
197 | return 0; | 197 | return 0; |
198 | } | 198 | } |
199 | 199 | ||
200 | static int __devinit tca6416_keypad_probe(struct i2c_client *client, | 200 | static int tca6416_keypad_probe(struct i2c_client *client, |
201 | const struct i2c_device_id *id) | 201 | const struct i2c_device_id *id) |
202 | { | 202 | { |
203 | struct tca6416_keys_platform_data *pdata; | 203 | struct tca6416_keys_platform_data *pdata; |
@@ -313,7 +313,7 @@ fail1: | |||
313 | return error; | 313 | return error; |
314 | } | 314 | } |
315 | 315 | ||
316 | static int __devexit tca6416_keypad_remove(struct i2c_client *client) | 316 | static int tca6416_keypad_remove(struct i2c_client *client) |
317 | { | 317 | { |
318 | struct tca6416_keypad_chip *chip = i2c_get_clientdata(client); | 318 | struct tca6416_keypad_chip *chip = i2c_get_clientdata(client); |
319 | 319 | ||
@@ -361,7 +361,7 @@ static struct i2c_driver tca6416_keypad_driver = { | |||
361 | .pm = &tca6416_keypad_dev_pm_ops, | 361 | .pm = &tca6416_keypad_dev_pm_ops, |
362 | }, | 362 | }, |
363 | .probe = tca6416_keypad_probe, | 363 | .probe = tca6416_keypad_probe, |
364 | .remove = __devexit_p(tca6416_keypad_remove), | 364 | .remove = tca6416_keypad_remove, |
365 | .id_table = tca6416_id, | 365 | .id_table = tca6416_id, |
366 | }; | 366 | }; |
367 | 367 | ||