From mboxrd@z Thu Jan 1 00:00:00 1970 From: Marc Zyngier Subject: Re: [PATCH 4/6] irqchip: GIC: Use chip_data instead of handler_data for cascaded interrupts Date: Fri, 10 Jul 2015 08:52:38 +0100 Message-ID: <559F79C6.8020107@arm.com> References: <1436447951-22357-1-git-send-email-marc.zyngier@arm.com> <1436447951-22357-5-git-send-email-marc.zyngier@arm.com> Mime-Version: 1.0 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Cc: Jason Cooper , Christoffer Dall , Jiang Liu , Eric Auger , "linux-arm-kernel@lists.infradead.org" , "kvmarm@lists.cs.columbia.edu" , "kvm@vger.kernel.org" To: Thomas Gleixner Return-path: Received: from foss.arm.com ([217.140.101.70]:49560 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752224AbbGJHwm (ORCPT ); Fri, 10 Jul 2015 03:52:42 -0400 In-Reply-To: Sender: kvm-owner@vger.kernel.org List-ID: 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 >> --- >> 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... ;-) M. -- Jazz is not dead. It just smells funny...