leds: pca9532: use gpiochip data pointer

This makes the driver use the data pointer added to the gpio_chip
to store a pointer to the state container instead of relying on
container_of().

Cc: Riku Voipio <riku.voipio@iki.fi>
Cc: Richard Purdie <rpurdie@rpsys.net>
Cc: linux-leds@vger.kernel.org
Acked-by: Jacek Anaszewski <j.anaszewski@samsung.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/leds/leds-pca9532.c b/drivers/leds/leds-pca9532.c
index a975b32ee8c8dca8e84e0e6e3ae61f8852e63d98..1b228adfd1a76c4e3ac182d4044069c47a38c4f4 100644 (file)
--- a/drivers/leds/leds-pca9532.c
+++ b/drivers/leds/leds-pca9532.c
@@ -245,7 +245,7 @@ static void pca9532_led_work(struct work_struct *work)
 #ifdef CONFIG_LEDS_PCA9532_GPIO
 static int pca9532_gpio_request_pin(struct gpio_chip *gc, unsigned offset)
 {
-       struct pca9532_data *data = container_of(gc, struct pca9532_data, gpio);
+       struct pca9532_data *data = gpiochip_get_data(gc);
        struct pca9532_led *led = &data->leds[offset];
 
        if (led->type == PCA9532_TYPE_GPIO)
@@ -256,7 +256,7 @@ static int pca9532_gpio_request_pin(struct gpio_chip *gc, unsigned offset)
 
 static void pca9532_gpio_set_value(struct gpio_chip *gc, unsigned offset, int val)
 {
-       struct pca9532_data *data = container_of(gc, struct pca9532_data, gpio);
+       struct pca9532_data *data = gpiochip_get_data(gc);
        struct pca9532_led *led = &data->leds[offset];
 
        if (val)
@@ -269,7 +269,7 @@ static void pca9532_gpio_set_value(struct gpio_chip *gc, unsigned offset, int va
 
 static int pca9532_gpio_get_value(struct gpio_chip *gc, unsigned offset)
 {
-       struct pca9532_data *data = container_of(gc, struct pca9532_data, gpio);
+       struct pca9532_data *data = gpiochip_get_data(gc);
        unsigned char reg;
 
        reg = i2c_smbus_read_byte_data(data->client, PCA9532_REG_INPUT(offset));
@@ -416,7 +416,7 @@ static int pca9532_configure(struct i2c_client *client,
                data->gpio.parent = &client->dev;
                data->gpio.owner = THIS_MODULE;
 
-               err = gpiochip_add(&data->gpio);
+               err = gpiochip_add_data(&data->gpio, data);
                if (err) {
                        /* Use data->gpio.dev as a flag for freeing gpiochip */
                        data->gpio.parent = NULL;