Merge tag 'hsi-for-4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi

[cascardo/linux.git] / drivers / gpio / gpio-mc33880.c

diff --git a/drivers/gpio/gpio-mc33880.c b/drivers/gpio/gpio-mc33880.c
index 2853731..0f0df79 100644 (file)
--- a/drivers/gpio/gpio-mc33880.c
+++ b/drivers/gpio/gpio-mc33880.c
@@ -71,7 +71,7 @@ static int __mc33880_set(struct mc33880 *mc, unsigned offset, int value)
 
 static void mc33880_set(struct gpio_chip *chip, unsigned offset, int value)
 {
-       struct mc33880 *mc = container_of(chip, struct mc33880, chip);
+       struct mc33880 *mc = gpiochip_get_data(chip);
 
        mutex_lock(&mc->lock);
 
@@ -116,7 +116,7 @@ static int mc33880_probe(struct spi_device *spi)
        mc->chip.base = pdata->base;
        mc->chip.ngpio = PIN_NUMBER;
        mc->chip.can_sleep = true;
-       mc->chip.dev = &spi->dev;
+       mc->chip.parent = &spi->dev;
        mc->chip.owner = THIS_MODULE;
 
        mc->port_config = 0x00;
@@ -135,7 +135,7 @@ static int mc33880_probe(struct spi_device *spi)
                goto exit_destroy;
        }
 
-       ret = gpiochip_add(&mc->chip);
+       ret = gpiochip_add_data(&mc->chip, mc);
        if (ret)
                goto exit_destroy;