Merge tag 'nfs-for-4.5-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs

[deliverable/linux.git] / drivers / leds / leds-tca6507.c

diff --git a/drivers/leds/leds-tca6507.c b/drivers/leds/leds-tca6507.c
index edbecc4ca2da4c2df887e56c34fcee33c88ca847..c548ea10f0f036648d1d357f998641551ff3f2a6 100644 (file)
--- a/drivers/leds/leds-tca6507.c
+++ b/drivers/leds/leds-tca6507.c
@@ -603,7 +603,7 @@ static int tca6507_blink_set(struct led_classdev *led_cdev,
 static void tca6507_gpio_set_value(struct gpio_chip *gc,
                                   unsigned offset, int val)
 {
-       struct tca6507_chip *tca = container_of(gc, struct tca6507_chip, gpio);
+       struct tca6507_chip *tca = gpiochip_get_data(gc);
        unsigned long flags;
 
        spin_lock_irqsave(&tca->lock, flags);
@@ -651,11 +651,11 @@ static int tca6507_probe_gpios(struct i2c_client *client,
        tca->gpio.owner = THIS_MODULE;
        tca->gpio.direction_output = tca6507_gpio_direction_output;
        tca->gpio.set = tca6507_gpio_set_value;
-       tca->gpio.dev = &client->dev;
+       tca->gpio.parent = &client->dev;
 #ifdef CONFIG_OF_GPIO
        tca->gpio.of_node = of_node_get(client->dev.of_node);
 #endif
-       err = gpiochip_add(&tca->gpio);
+       err = gpiochip_add_data(&tca->gpio, tca);
        if (err) {
                tca->gpio.ngpio = 0;
                return err;