On Wed, Nov 13, 2019 at 08:05:20PM +0100, Hans de Goede wrote: > We need to convert all old gpio irqchips to pass the irqchip > setup along when adding the gpio_chip. For more info see > drivers/gpio/TODO. > > For chained irqchips this is a pretty straight-forward conversion. > > Acked-by: Mika Westerberg <mika.westerberg@xxxxxxxxxxxxxxx> > Signed-off-by: Hans de Goede <hdegoede@xxxxxxxxxx> > struct irq_chip irqchip; > void __iomem *regs; > + unsigned int irq; > unsigned intr_lines[16]; This will conflict with our for-next. > + if (need_valid_mask) > + chip->irq.init_valid_mask = chv_init_irq_valid_mask; > + chip->irq.init_hw = chv_gpio_irq_init_hw; > + chip->irq.parent_handler = chv_gpio_irq_handler; > + chip->irq.num_parents = 1; > + chip->irq.parents = &pctrl->irq; > + chip->irq.default_type = IRQ_TYPE_NONE; > + chip->irq.handler = handle_bad_irq; > > if (!need_valid_mask) { > irq_base = devm_irq_alloc_descs(pctrl->dev, -1, 0, Perhaps now it makes sense to if (need_valid_mask) { chip->irq.init_valid_mask = chv_init_irq_valid_mask; } else { irq_base = devm_irq_alloc_descs(pctrl->dev, -1, 0, ... } ? -- With Best Regards, Andy Shevchenko