aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/mfd/twl6040.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/mfd/twl6040.c')
-rw-r--r--drivers/mfd/twl6040.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/mfd/twl6040.c b/drivers/mfd/twl6040.c
index 583be76e36a8..f361bf38a0aa 100644
--- a/drivers/mfd/twl6040.c
+++ b/drivers/mfd/twl6040.c
@@ -517,8 +517,8 @@ static struct regmap_irq_chip twl6040_irq_chip = {
517 .mask_base = TWL6040_REG_INTMR, 517 .mask_base = TWL6040_REG_INTMR,
518}; 518};
519 519
520static int __devinit twl6040_probe(struct i2c_client *client, 520static int twl6040_probe(struct i2c_client *client,
521 const struct i2c_device_id *id) 521 const struct i2c_device_id *id)
522{ 522{
523 struct twl6040_platform_data *pdata = client->dev.platform_data; 523 struct twl6040_platform_data *pdata = client->dev.platform_data;
524 struct device_node *node = client->dev.of_node; 524 struct device_node *node = client->dev.of_node;
@@ -699,7 +699,7 @@ err:
699 return ret; 699 return ret;
700} 700}
701 701
702static int __devexit twl6040_remove(struct i2c_client *client) 702static int twl6040_remove(struct i2c_client *client)
703{ 703{
704 struct twl6040 *twl6040 = i2c_get_clientdata(client); 704 struct twl6040 *twl6040 = i2c_get_clientdata(client);
705 705
@@ -735,7 +735,7 @@ static struct i2c_driver twl6040_driver = {
735 .owner = THIS_MODULE, 735 .owner = THIS_MODULE,
736 }, 736 },
737 .probe = twl6040_probe, 737 .probe = twl6040_probe,
738 .remove = __devexit_p(twl6040_remove), 738 .remove = twl6040_remove,
739 .id_table = twl6040_i2c_id, 739 .id_table = twl6040_i2c_id,
740}; 740};
741 741