On 10/07/15 09:17, Jiang Liu wrote: > On 2015/7/10 15:52, Marc Zyngier wrote: >> On 09/07/15 22:33, Thomas Gleixner wrote: >>> 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 .... >> >> Ah, very good point. >> >> And it turns out that these constructs (use of irq_get_* when the >> irq_desc is readily available) is actually fairly common in a number of >> irqchip implementations used as secondary interrupt controllers. >> >> Time for another cleanup series, I believe... ;-) > Hi Marc, > I'm ahead of your request and expect an reviewed-by from > you then:). Please refer to http://lkml.org/lkml/2015/6/4/743 for > what we have done to clear up this interfaces. Ah, let me dig this now (yeah, I've been slacking off on reviewing lately...). Looks awesome! :-) Thanks! M. -- Jazz is not dead. It just smells funny... -- 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