Skip to contentSkip to conversation

pinctrl: cherryview: Use GPIO chip pointer in chv_gpio_irq_mask_unmask()

PATCH In review Andy Shevchenko 2 participants 3 messages May 16, 2022 – May 17, 2022

Subsystems (3)
GPIO Pin control Pin controller - Intel
lore
Share & tools
lore

Andy Shevchenko

author
#0 lore raw

PATCH 1/1 pinctrl: cherryview: Use GPIO chip pointer in chv_gpio_irq_mask_unmask()

The callers already have dereferenced pointer to GPIO chip, no need to do it again in chv_gpio_irq_mask_unmask(). Hence, replace IRQ data pointer by GPIO chip pointer.

Signed-off-by Andy Shevchenko <[email protected]>
---
 drivers/pinctrl/intel/pinctrl-cherryview.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/pinctrl/intel/pinctrl-cherryview.c +3 -4
index b696f9392789..26b2a425d201 100644
@@ -1255,9 +1255,8 @@ static void chv_gpio_irq_ack(struct irq_data *d)
 	raw_spin_unlock(&chv_lock);
 }
 
-static void chv_gpio_irq_mask_unmask(struct irq_data *d, irq_hw_number_t hwirq, bool mask)
+static void chv_gpio_irq_mask_unmask(struct gpio_chip *gc, irq_hw_number_t hwirq, bool mask)
 {
-	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
 	struct intel_pinctrl *pctrl = gpiochip_get_data(gc);
 	u32 value, intr_line;
 	unsigned long flags;

@@ -1283,7 +1282,7 @@ static void chv_gpio_irq_mask(struct irq_data *d)
 	struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
 	irq_hw_number_t hwirq = irqd_to_hwirq(d);
 
-	chv_gpio_irq_mask_unmask(d, hwirq, true);
+	chv_gpio_irq_mask_unmask(gc, hwirq, true);
 	gpiochip_disable_irq(gc, hwirq);
 }
 

@@ -1293,7 +1292,7 @@ static void chv_gpio_irq_unmask(struct irq_data *d)
 	irq_hw_number_t hwirq = irqd_to_hwirq(d);
 
 	gpiochip_enable_irq(gc, hwirq);
-	chv_gpio_irq_mask_unmask(d, hwirq, false);
+	chv_gpio_irq_mask_unmask(gc, hwirq, false);
 }
 
 static unsigned chv_gpio_irq_startup(struct irq_data *d)
Signature · 1 line
2.35.1
author
#2 lore raw
Quoted 8 lines · Mika Westerberg
Quoted 5 lines · Andy Shevchenko

The callers already have dereferenced pointer to GPIO chip, no need to do it again in chv_gpio_irq_mask_unmask(). Hence, replace IRQ data pointer by GPIO chip pointer.

Signed-off-by Andy Shevchenko <[email protected]>
Acked-by Mika Westerberg <[email protected]>

Pushed to my review and testing queue, thanks!

Signature · 2 lines
With Best Regards,
Andy Shevchenko