Skip to contentSkip to conversation

gpio: mockup: Switch to use gpiochip_get_desc()

PATCH In review Andy Shevchenko 2 participants 2 messages May 10, 2021 – May 12, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 gpio: mockup: Switch to use gpiochip_get_desc()

Switch to use gpiochip_get_desc() helper.

---
 drivers/gpio/gpio-mockup.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/gpio/gpio-mockup.c +3 -6
index d7e73876a3b9..0a9d746a0fe0 100644
@@ -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);
Signature · 1 line
2.30.2
#1 lore raw
Quoted 37 lines · Andy Shevchenko

Switch to use gpiochip_get_desc() helper.

---
 drivers/gpio/gpio-mockup.c | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
drivers/gpio/gpio-mockup.c +3 -7
index d7e73876a3b9..0a9d746a0fe0 100644
@@ -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);
--
Quoted 2 lines

2.30.2

Patch applied, thanks!

Bartosz