Merge tag 'mfd-3.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / mfd / tps65217.c

diff --git a/drivers/mfd/tps65217.c b/drivers/mfd/tps65217.c
index c7f17d8..b8f4864 100644 (file)
--- a/drivers/mfd/tps65217.c
+++ b/drivers/mfd/tps65217.c
@@ -153,7 +153,7 @@ static const struct of_device_id tps65217_of_match[] = {
        { /* sentinel */ },
 };
 
-static int __devinit tps65217_probe(struct i2c_client *client,
+static int tps65217_probe(struct i2c_client *client,
                                const struct i2c_device_id *ids)
 {
        struct tps65217 *tps;
@@ -226,7 +226,7 @@ static int __devinit tps65217_probe(struct i2c_client *client,
        return 0;
 }
 
-static int __devexit tps65217_remove(struct i2c_client *client)
+static int tps65217_remove(struct i2c_client *client)
 {
        struct tps65217 *tps = i2c_get_clientdata(client);
 
@@ -249,7 +249,7 @@ static struct i2c_driver tps65217_driver = {
        },
        .id_table       = tps65217_id_table,
        .probe          = tps65217_probe,
-       .remove         = __devexit_p(tps65217_remove),
+       .remove         = tps65217_remove,
 };
 
 static int __init tps65217_init(void)