pinctrl: nomadik: Dereference gpio_chip properly

The irq data passed to irc_chip handlers i the struct gpio_chip
and nothing else. We are just lucky that the nomadik chip
pointer is first in the struct. Use the proper dereferencing
and helpers.

Reported-by: Marc Zyngier <maz@kernel.org>
Acked-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20220917203036.167607-1-linus.walleij@linaro.org
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/nomadik/pinctrl-nomadik.c b/drivers/pinctrl/nomadik/pinctrl-nomadik.c
index 58c7ac8c7d4d197ed3feb751021b51bdd407a319..54852775d653188182ba6c37ec0271394afa05d1 100644 (file)
--- a/drivers/pinctrl/nomadik/pinctrl-nomadik.c
+++ b/drivers/pinctrl/nomadik/pinctrl-nomadik.c
@@ -608,8 +608,8 @@ static int __maybe_unused nmk_prcm_gpiocr_get_mode(struct pinctrl_dev *pctldev,
 
 static void nmk_gpio_irq_ack(struct irq_data *d)
 {
-       struct gpio_chip *chip = irq_data_get_irq_chip_data(d);
-       struct nmk_gpio_chip *nmk_chip = gpiochip_get_data(chip);
+       struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
+       struct nmk_gpio_chip *nmk_chip = gpiochip_get_data(gc);
 
        clk_enable(nmk_chip->clk);
        writel(BIT(d->hwirq), nmk_chip->addr + NMK_GPIO_IC);
@@ -677,13 +677,10 @@ static void __nmk_gpio_set_wake(struct nmk_gpio_chip *nmk_chip,
 
 static int nmk_gpio_irq_maskunmask(struct irq_data *d, bool enable)
 {
-       struct nmk_gpio_chip *nmk_chip;
+       struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
+       struct nmk_gpio_chip *nmk_chip = gpiochip_get_data(gc);
        unsigned long flags;
 
-       nmk_chip = irq_data_get_irq_chip_data(d);
-       if (!nmk_chip)
-               return -EINVAL;
-
        clk_enable(nmk_chip->clk);
        spin_lock_irqsave(&nmk_gpio_slpm_lock, flags);
        spin_lock(&nmk_chip->lock);
@@ -712,13 +709,10 @@ static void nmk_gpio_irq_unmask(struct irq_data *d)
 
 static int nmk_gpio_irq_set_wake(struct irq_data *d, unsigned int on)
 {
-       struct nmk_gpio_chip *nmk_chip;
+       struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
+       struct nmk_gpio_chip *nmk_chip = gpiochip_get_data(gc);
        unsigned long flags;
 
-       nmk_chip = irq_data_get_irq_chip_data(d);
-       if (!nmk_chip)
-               return -EINVAL;
-
        clk_enable(nmk_chip->clk);
        spin_lock_irqsave(&nmk_gpio_slpm_lock, flags);
        spin_lock(&nmk_chip->lock);
@@ -740,14 +734,12 @@ static int nmk_gpio_irq_set_wake(struct irq_data *d, unsigned int on)
 
 static int nmk_gpio_irq_set_type(struct irq_data *d, unsigned int type)
 {
+       struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
+       struct nmk_gpio_chip *nmk_chip = gpiochip_get_data(gc);
        bool enabled = !irqd_irq_disabled(d);
        bool wake = irqd_is_wakeup_set(d);
-       struct nmk_gpio_chip *nmk_chip;
        unsigned long flags;
 
-       nmk_chip = irq_data_get_irq_chip_data(d);
-       if (!nmk_chip)
-               return -EINVAL;
        if (type & IRQ_TYPE_LEVEL_HIGH)
                return -EINVAL;
        if (type & IRQ_TYPE_LEVEL_LOW)
@@ -784,7 +776,8 @@ static int nmk_gpio_irq_set_type(struct irq_data *d, unsigned int type)
 
 static unsigned int nmk_gpio_irq_startup(struct irq_data *d)
 {
-       struct nmk_gpio_chip *nmk_chip = irq_data_get_irq_chip_data(d);
+       struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
+       struct nmk_gpio_chip *nmk_chip = gpiochip_get_data(gc);
 
        clk_enable(nmk_chip->clk);
        nmk_gpio_irq_unmask(d);
@@ -793,7 +786,8 @@ static unsigned int nmk_gpio_irq_startup(struct irq_data *d)
 
 static void nmk_gpio_irq_shutdown(struct irq_data *d)
 {
-       struct nmk_gpio_chip *nmk_chip = irq_data_get_irq_chip_data(d);
+       struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
+       struct nmk_gpio_chip *nmk_chip = gpiochip_get_data(gc);
 
        nmk_gpio_irq_mask(d);
        clk_disable(nmk_chip->clk);