Merge tag 'arm-dt-5.14' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[linux-2.6-microblaze.git] / drivers / gpio / gpio-mockup.c

diff --git a/drivers/gpio/gpio-mockup.c b/drivers/gpio/gpio-mockup.c
index d7e7387..0a9d746 100644 (file)
--- a/drivers/gpio/gpio-mockup.c
+++ b/drivers/gpio/gpio-mockup.c
@@ -144,12 +144,9 @@ static void gpio_mockup_set_multiple(struct gpio_chip *gc,
 static int gpio_mockup_apply_pull(struct gpio_mockup_chip *chip,
                                  unsigned int offset, int value)
 {
+       struct gpio_chip *gc = &chip->gc;
+       struct gpio_desc *desc = gpiochip_get_desc(gc, offset);
        int curr, irq, irq_type, ret = 0;
-       struct gpio_desc *desc;
-       struct gpio_chip *gc;
-
-       gc = &chip->gc;
-       desc = &gc->gpiodev->descs[offset];
 
        mutex_lock(&chip->lock);
 
@@ -369,7 +366,7 @@ static void gpio_mockup_debugfs_setup(struct device *dev,
 
                priv->chip = chip;
                priv->offset = i;
-               priv->desc = &gc->gpiodev->descs[i];
+               priv->desc = gpiochip_get_desc(gc, i);
 
                debugfs_create_file(name, 0200, chip->dbg_dir, priv,
                                    &gpio_mockup_debugfs_ops);