Skip to content

Commit 68aa84f

Browse files
committed
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 <andriy.shevchenko@linux.intel.com> Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
1 parent 180f9db commit 68aa84f

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

drivers/pinctrl/intel/pinctrl-cherryview.c

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1255,9 +1255,8 @@ static void chv_gpio_irq_ack(struct irq_data *d)
12551255
raw_spin_unlock(&chv_lock);
12561256
}
12571257

1258-
static void chv_gpio_irq_mask_unmask(struct irq_data *d, irq_hw_number_t hwirq, bool mask)
1258+
static void chv_gpio_irq_mask_unmask(struct gpio_chip *gc, irq_hw_number_t hwirq, bool mask)
12591259
{
1260-
struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
12611260
struct intel_pinctrl *pctrl = gpiochip_get_data(gc);
12621261
u32 value, intr_line;
12631262
unsigned long flags;
@@ -1283,7 +1282,7 @@ static void chv_gpio_irq_mask(struct irq_data *d)
12831282
struct gpio_chip *gc = irq_data_get_irq_chip_data(d);
12841283
irq_hw_number_t hwirq = irqd_to_hwirq(d);
12851284

1286-
chv_gpio_irq_mask_unmask(d, hwirq, true);
1285+
chv_gpio_irq_mask_unmask(gc, hwirq, true);
12871286
gpiochip_disable_irq(gc, hwirq);
12881287
}
12891288

@@ -1293,7 +1292,7 @@ static void chv_gpio_irq_unmask(struct irq_data *d)
12931292
irq_hw_number_t hwirq = irqd_to_hwirq(d);
12941293

12951294
gpiochip_enable_irq(gc, hwirq);
1296-
chv_gpio_irq_mask_unmask(d, hwirq, false);
1295+
chv_gpio_irq_mask_unmask(gc, hwirq, false);
12971296
}
12981297

12991298
static unsigned chv_gpio_irq_startup(struct irq_data *d)

0 commit comments

Comments
 (0)