Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[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 d62b4f8182bf0c9ca7259299fd1451e85b358e81..ba22fb92a6e7df10d411ccd9882677fae80bf465 100644 (file)
--- a/drivers/gpio/gpio-mc9s08dz60.c
+++ b/drivers/gpio/gpio-mc9s08dz60.c
@@ -29,12 +29,6 @@ struct mc9s08dz60 {
        struct gpio_chip chip;
 };
 
-static inline struct mc9s08dz60 *to_mc9s08dz60(struct gpio_chip *gc)
-{
-       return container_of(gc, struct mc9s08dz60, chip);
-}
-
-
 static void mc9s_gpio_to_reg_and_bit(int offset, u8 *reg, u8 *bit)
 {
        *reg = 0x20 + offset / GPIO_NUM_PER_GROUP;
@@ -45,7 +39,7 @@ static int mc9s08dz60_get_value(struct gpio_chip *gc, unsigned offset)
 {
        u8 reg, bit;
        s32 value;
-       struct mc9s08dz60 *mc9s = to_mc9s08dz60(gc);
+       struct mc9s08dz60 *mc9s = gpiochip_get_data(gc);
 
        mc9s_gpio_to_reg_and_bit(offset, &reg, &bit);
        value = i2c_smbus_read_byte_data(mc9s->client, reg);
@@ -75,7 +69,7 @@ static int mc9s08dz60_set(struct mc9s08dz60 *mc9s, unsigned offset, int val)
 
 static void mc9s08dz60_set_value(struct gpio_chip *gc, unsigned offset, int val)
 {
-       struct mc9s08dz60 *mc9s = to_mc9s08dz60(gc);
+       struct mc9s08dz60 *mc9s = gpiochip_get_data(gc);
 
        mc9s08dz60_set(mc9s, offset, val);
 }
@@ -83,7 +77,7 @@ static void mc9s08dz60_set_value(struct gpio_chip *gc, unsigned offset, int val)
 static int mc9s08dz60_direction_output(struct gpio_chip *gc,
                                       unsigned offset, int val)
 {
-       struct mc9s08dz60 *mc9s = to_mc9s08dz60(gc);
+       struct mc9s08dz60 *mc9s = gpiochip_get_data(gc);
 
        return mc9s08dz60_set(mc9s, offset, val);
 }
@@ -99,7 +93,7 @@ static int mc9s08dz60_probe(struct i2c_client *client,
 
        mc9s->chip.label = client->name;
        mc9s->chip.base = -1;
-       mc9s->chip.dev = &client->dev;
+       mc9s->chip.parent = &client->dev;
        mc9s->chip.owner = THIS_MODULE;
        mc9s->chip.ngpio = GPIO_NUM;
        mc9s->chip.can_sleep = true;
@@ -109,7 +103,7 @@ static int mc9s08dz60_probe(struct i2c_client *client,
        mc9s->client = client;
        i2c_set_clientdata(client, mc9s);
 
-       return gpiochip_add(&mc9s->chip);
+       return gpiochip_add_data(&mc9s->chip, mc9s);
 }
 
 static int mc9s08dz60_remove(struct i2c_client *client)
@@ -131,7 +125,6 @@ MODULE_DEVICE_TABLE(i2c, mc9s08dz60_id);
 
 static struct i2c_driver mc9s08dz60_i2c_driver = {
        .driver = {
-               .owner = THIS_MODULE,
                .name = "mc9s08dz60",
        },
        .probe = mc9s08dz60_probe,