Merge tag 'regulator-3.8' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie...

[can-eth-gw-linux.git] / drivers / mfd / tps6586x.c

diff --git a/drivers/mfd/tps6586x.c b/drivers/mfd/tps6586x.c
index 9d67bd92edf8d39bce86130e547ab0c4e8010090..87ba7ada3bbc8a72392745cdc3400fb541e8056c 100644 (file)
--- a/drivers/mfd/tps6586x.c
+++ b/drivers/mfd/tps6586x.c
@@ -268,7 +268,7 @@ static irqreturn_t tps6586x_irq(int irq, void *data)
        return IRQ_HANDLED;
 }
 
-static int __devinit tps6586x_irq_init(struct tps6586x *tps6586x, int irq,
+static int tps6586x_irq_init(struct tps6586x *tps6586x, int irq,
                                       int irq_base)
 {
        int i, ret;
@@ -317,7 +317,7 @@ static int __devinit tps6586x_irq_init(struct tps6586x *tps6586x, int irq,
        return ret;
 }
 
-static int __devinit tps6586x_add_subdevs(struct tps6586x *tps6586x,
+static int tps6586x_add_subdevs(struct tps6586x *tps6586x,
                                          struct tps6586x_platform_data *pdata)
 {
        struct tps6586x_subdev_info *subdev;
@@ -408,7 +408,7 @@ static void tps6586x_power_off(void)
        tps6586x_set_bits(tps6586x_dev, TPS6586X_SUPPLYENE, SLEEP_MODE_BIT);
 }
 
-static int __devinit tps6586x_i2c_probe(struct i2c_client *client,
+static int tps6586x_i2c_probe(struct i2c_client *client,
                                        const struct i2c_device_id *id)
 {
        struct tps6586x_platform_data *pdata = client->dev.platform_data;
@@ -488,7 +488,7 @@ err_mfd_add:
        return ret;
 }
 
-static int __devexit tps6586x_i2c_remove(struct i2c_client *client)
+static int tps6586x_i2c_remove(struct i2c_client *client)
 {
        struct tps6586x *tps6586x = i2c_get_clientdata(client);
 
@@ -512,7 +512,7 @@ static struct i2c_driver tps6586x_driver = {
                .of_match_table = of_match_ptr(tps6586x_of_match),
        },
        .probe          = tps6586x_i2c_probe,
-       .remove         = __devexit_p(tps6586x_i2c_remove),
+       .remove         = tps6586x_i2c_remove,
        .id_table       = tps6586x_id_table,
 };