From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754608AbbGMUvg (ORCPT ); Mon, 13 Jul 2015 16:51:36 -0400 Received: from www.linutronix.de ([62.245.132.108]:56396 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754585AbbGMUve (ORCPT ); Mon, 13 Jul 2015 16:51:34 -0400 Message-Id: <20150713151626.872605327@linutronix.de> User-Agent: quilt/0.63-1 Date: Mon, 13 Jul 2015 20:51:26 -0000 From: Thomas Gleixner To: LKML Cc: Jiang Liu , Simon Horman , Magnus Damm , Julia Lawall Subject: [patch 5/5] sh/intc: Prepare irq flow handlers for irq argument removal References: <20150713151529.858862519@linutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=sh-intc--Prepare-irq-flow-handlers-for-irq-argument-removal.patch X-Linutronix-Spam-Score: -1.0 X-Linutronix-Spam-Level: - X-Linutronix-Spam-Status: No , -1.0 points, 5.0 required, ALL_TRUSTED=-1,SHORTCIRCUIT=-0.0001,URIBL_BLOCKED=0.001 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The irq argument of most interrupt flow handlers is unused or merily used instead of a local variable. The handlers which need the irq argument can retrieve the irq number from the irq descriptor. Search and update was done with coccinelle and the invaluable help of Julia Lawall. Signed-off-by: Thomas Gleixner Cc: Julia Lawall Cc: Jiang Liu Cc: Simon Horman Cc: Magnus Damm --- arch/sh/boards/mach-se/7724/irq.c | 3 ++- drivers/sh/intc/virq.c | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) Index: tip/arch/sh/boards/mach-se/7724/irq.c =================================================================== --- tip.orig/arch/sh/boards/mach-se/7724/irq.c +++ tip/arch/sh/boards/mach-se/7724/irq.c @@ -92,8 +92,9 @@ static struct irq_chip se7724_irq_chip _ .irq_unmask = enable_se7724_irq, }; -static void se7724_irq_demux(unsigned int irq, struct irq_desc *desc) +static void se7724_irq_demux(unsigned int __irq, struct irq_desc *desc) { + unsigned int irq = irq_desc_get_irq(desc); struct fpga_irq set = get_fpga_irq(irq); unsigned short intv = __raw_readw(set.sraddr); unsigned int ext_irq = set.base; Index: tip/drivers/sh/intc/virq.c =================================================================== --- tip.orig/drivers/sh/intc/virq.c +++ tip/drivers/sh/intc/virq.c @@ -109,8 +109,9 @@ static int add_virq_to_pirq(unsigned int return 0; } -static void intc_virq_handler(unsigned int irq, struct irq_desc *desc) +static void intc_virq_handler(unsigned int __irq, struct irq_desc *desc) { + unsigned int irq = irq_desc_get_irq(desc); struct irq_data *data = irq_desc_get_irq_data(desc); struct irq_chip *chip = irq_data_get_irq_chip(data); struct intc_virq_list *entry, *vlist = irq_data_get_irq_handler_data(data);