Merge tag 'pm+acpi-4.6-rc1-3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael...

[linux-2.6-block.git] / drivers / gpio / gpio-mc9s08dz60.c

diff --git a/drivers/gpio/gpio-mc9s08dz60.c b/drivers/gpio/gpio-mc9s08dz60.c
index ba22fb92a6e7df10d411ccd9882677fae80bf465..14f252f9eb298166b684f9f456eecf68b1036933 100644 (file)
--- a/drivers/gpio/gpio-mc9s08dz60.c
+++ b/drivers/gpio/gpio-mc9s08dz60.c
@@ -103,17 +103,7 @@ static int mc9s08dz60_probe(struct i2c_client *client,
        mc9s->client = client;
        i2c_set_clientdata(client, mc9s);
 
-       return gpiochip_add_data(&mc9s->chip, mc9s);
-}
-
-static int mc9s08dz60_remove(struct i2c_client *client)
-{
-       struct mc9s08dz60 *mc9s;
-
-       mc9s = i2c_get_clientdata(client);
-
-       gpiochip_remove(&mc9s->chip);
-       return 0;
+       return devm_gpiochip_add_data(&client->dev, &mc9s->chip, mc9s);
 }
 
 static const struct i2c_device_id mc9s08dz60_id[] = {
@@ -128,7 +118,6 @@ static struct i2c_driver mc9s08dz60_i2c_driver = {
                .name = "mc9s08dz60",
        },
        .probe = mc9s08dz60_probe,
-       .remove = mc9s08dz60_remove,
        .id_table = mc9s08dz60_id,
 };