On Thu, 9 Jul 2015, Marc Zyngier wrote: > When used as a primary interrupt controller, the GIC driver uses > irq_data->chip_data to extract controller-specific information. > > When used as a secondary interrupt controller, it uses handler_data > instead. As this difference is relatively pointless and only creates > confusion, change the secondary path to match what the rest of the > driver does. > > Signed-off-by: Marc Zyngier <marc.zyngier@xxxxxxx> > --- > drivers/irqchip/irq-gic.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c > index e264675..3c7f3a4 100644 > --- a/drivers/irqchip/irq-gic.c > +++ b/drivers/irqchip/irq-gic.c > @@ -298,7 +298,7 @@ static void __exception_irq_entry gic_handle_irq(struct pt_regs *regs) > > static void gic_handle_cascade_irq(unsigned int irq, struct irq_desc *desc) > { > - struct gic_chip_data *chip_data = irq_get_handler_data(irq); > + struct gic_chip_data *chip_data = irq_get_chip_data(irq); > struct irq_chip *chip = irq_get_chip(irq); You should make that chip_data = irq_desc_get_chip_data(desc); chip = irq_desc_get_chip(desc); That avoids two pointless lookups of irqdesc .... Thanks, tglx -- To unsubscribe from this list: send the line "unsubscribe kvm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html