From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752779AbbIBCZM (ORCPT ); Tue, 1 Sep 2015 22:25:12 -0400 Received: from eu-smtp-delivery-143.mimecast.com ([207.82.80.143]:23891 "EHLO eu-smtp-delivery-143.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751577AbbIBCZL (ORCPT ); Tue, 1 Sep 2015 22:25:11 -0400 From: Huang Shijie To: tglx@linutronix.de Cc: jiang.liu@linux.intel.com, peterz@infradead.org, marc.zyngier@arm.com, linux-kernel@vger.kernel.org, Huang Shijie Subject: [PATCH] genirq: Remove the second parameter from handle_irq_event_percpu Date: Wed, 2 Sep 2015 10:24:55 +0800 Message-Id: <1441160695-19809-1-git-send-email-shijie.huang@arm.com> X-Mailer: git-send-email 2.1.4 X-OriginalArrivalTime: 02 Sep 2015 02:25:08.0204 (UTC) FILETIME=[9602FAC0:01D0E526] X-MC-Unique: mp_gLBtkSIaQ5FQb9FVoGw-1 Content-Type: text/plain; charset=WINDOWS-1252 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: 8bit X-MIME-Autoconverted: from quoted-printable to 8bit by mail.home.local id t822PJGP024578 Actually, we always use the first irq action of the @desc->action chain, this patch remove the second parameter from handle_irq_event_percpu() which makes the code more tidy. Signed-off-by: Huang Shijie --- kernel/irq/chip.c | 2 +- kernel/irq/handle.c | 7 +++---- kernel/irq/internals.h | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 6e40a95..27e4833 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -680,7 +680,7 @@ handle_percpu_irq(unsigned int irq, struct irq_desc *desc) if (chip->irq_ack) chip->irq_ack(&desc->irq_data); - handle_irq_event_percpu(desc, desc->action); + handle_irq_event_percpu(desc); if (chip->irq_eoi) chip->irq_eoi(&desc->irq_data); diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c index b6eeea8..bc2f892 100644 --- a/kernel/irq/handle.c +++ b/kernel/irq/handle.c @@ -130,11 +130,11 @@ void __irq_wake_thread(struct irq_desc *desc, struct irqaction *action) wake_up_process(action->thread); } -irqreturn_t -handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action) +irqreturn_t handle_irq_event_percpu(struct irq_desc *desc) { irqreturn_t retval = IRQ_NONE; unsigned int flags = 0, irq = desc->irq_data.irq; + struct irqaction *action = desc->action; do { irqreturn_t res; @@ -182,14 +182,13 @@ handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action) irqreturn_t handle_irq_event(struct irq_desc *desc) { - struct irqaction *action = desc->action; irqreturn_t ret; desc->istate &= ~IRQS_PENDING; irqd_set(&desc->irq_data, IRQD_IRQ_INPROGRESS); raw_spin_unlock(&desc->lock); - ret = handle_irq_event_percpu(desc, action); + ret = handle_irq_event_percpu(desc); raw_spin_lock(&desc->lock); irqd_clear(&desc->irq_data, IRQD_IRQ_INPROGRESS); diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h index eee4b38..1be888c 100644 --- a/kernel/irq/internals.h +++ b/kernel/irq/internals.h @@ -81,7 +81,7 @@ extern void irq_mark_irq(unsigned int irq); extern void init_kstat_irqs(struct irq_desc *desc, int node, int nr); -irqreturn_t handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *action); +irqreturn_t handle_irq_event_percpu(struct irq_desc *desc); irqreturn_t handle_irq_event(struct irq_desc *desc); /* Resending of interrupts :*/ -- 2.1.4