From: tip-bot for Jiang Liu <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: tglx@linutronix.de, hpa@zytor.com, linux-kernel@vger.kernel.org,
konrad.wilk@oracle.com, bp@alien8.de, jiang.liu@linux.intel.com,
mingo@kernel.org, rdunlap@infradead.org, bhelgaas@google.com,
yinghai@kernel.org, tony.luck@intel.com,
benh@kernel.crashing.org
Subject: [tip:irq/core] genirq: Remove the irq argument from check_irq_resend()
Date: Sat, 11 Jul 2015 14:31:59 -0700 [thread overview]
Message-ID: <tip-0798abeb7eec37dcc20f252c2195fc31c41561f9@git.kernel.org> (raw)
In-Reply-To: <1433391238-19471-18-git-send-email-jiang.liu@linux.intel.com>
Commit-ID: 0798abeb7eec37dcc20f252c2195fc31c41561f9
Gitweb: http://git.kernel.org/tip/0798abeb7eec37dcc20f252c2195fc31c41561f9
Author: Jiang Liu <jiang.liu@linux.intel.com>
AuthorDate: Thu, 4 Jun 2015 12:13:27 +0800
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Sat, 11 Jul 2015 23:14:24 +0200
genirq: Remove the irq argument from check_irq_resend()
It's only used in the software resend case and can be retrieved from
irq_desc if necessary.
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Randy Dunlap <rdunlap@infradead.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Link: http://lkml.kernel.org/r/1433391238-19471-18-git-send-email-jiang.liu@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
kernel/irq/chip.c | 2 +-
kernel/irq/internals.h | 2 +-
kernel/irq/manage.c | 2 +-
kernel/irq/resend.c | 4 +++-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index f3c3d55..0cfbd15 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -187,7 +187,7 @@ int irq_startup(struct irq_desc *desc, bool resend)
irq_enable(desc);
}
if (resend)
- check_irq_resend(desc, desc->irq_data.irq);
+ check_irq_resend(desc);
return ret;
}
diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h
index 3e03824..7054947e 100644
--- a/kernel/irq/internals.h
+++ b/kernel/irq/internals.h
@@ -90,7 +90,7 @@ irqreturn_t handle_irq_event_percpu(struct irq_desc *desc, struct irqaction *act
irqreturn_t handle_irq_event(struct irq_desc *desc);
/* Resending of interrupts :*/
-void check_irq_resend(struct irq_desc *desc, unsigned int irq);
+void check_irq_resend(struct irq_desc *desc);
bool irq_wait_for_poll(struct irq_desc *desc);
void __irq_wake_thread(struct irq_desc *desc, struct irqaction *action);
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index f974485..c2e835d 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -516,7 +516,7 @@ void __enable_irq(struct irq_desc *desc, unsigned int irq)
/* Prevent probing on this irq: */
irq_settings_set_noprobe(desc);
irq_enable(desc);
- check_irq_resend(desc, irq);
+ check_irq_resend(desc);
/* fall-through */
}
default:
diff --git a/kernel/irq/resend.c b/kernel/irq/resend.c
index 9065107..32fc47c 100644
--- a/kernel/irq/resend.c
+++ b/kernel/irq/resend.c
@@ -53,7 +53,7 @@ static DECLARE_TASKLET(resend_tasklet, resend_irqs, 0);
*
* Is called with interrupts disabled and desc->lock held.
*/
-void check_irq_resend(struct irq_desc *desc, unsigned int irq)
+void check_irq_resend(struct irq_desc *desc)
{
/*
* We do not resend level type interrupts. Level type
@@ -74,6 +74,8 @@ void check_irq_resend(struct irq_desc *desc, unsigned int irq)
if (!desc->irq_data.chip->irq_retrigger ||
!desc->irq_data.chip->irq_retrigger(&desc->irq_data)) {
#ifdef CONFIG_HARDIRQS_SW_RESEND
+ unsigned int irq = irq_desc_get_irq(desc);
+
/*
* If the interrupt has a parent irq and runs
* in the thread context of the parent irq,
next prev parent reply other threads:[~2015-07-11 21:34 UTC|newest]
Thread overview: 84+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-04 4:13 [RFT v2 00/48] Refine irq interfaces to reduce number of parameters Jiang Liu
2015-06-04 4:13 ` [RFT v2 01/48] genirq: Clean up outdated comments related to include/linux/irqdesc.h Jiang Liu
2015-06-26 19:49 ` [tip:irq/urgent] " tip-bot for Jiang Liu
2015-06-04 4:13 ` [RFT v2 02/48] genirq: Kill never used irq_node() Jiang Liu
2015-06-26 19:49 ` [tip:irq/urgent] genirq: Remove irq_node() tip-bot for Jiang Liu
2015-06-04 4:13 ` [RFT v2 03/48] MIPS, irq: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc Jiang Liu
2015-06-04 12:15 ` Sergey Ryazanov
2015-06-04 4:13 ` [RFT v2 04/48] powerpc, " Jiang Liu
2015-06-04 4:13 ` [RFT v2 05/48] gpio: " Jiang Liu
2015-06-04 6:20 ` Javier Martinez Canillas
2015-06-04 4:13 ` [RFT v2 06/48] pinctrl: " Jiang Liu
2015-06-05 3:06 ` Tomasz Figa
2015-06-10 8:39 ` Heiko Stübner
2015-06-10 10:29 ` Matthias Brugger
2015-06-04 4:13 ` [RFT v2 07/48] avr32, irq: " Jiang Liu
2015-06-04 4:13 ` [RFT v2 08/48] mfd: " Jiang Liu
2015-06-04 4:13 ` [RFT v2 09/48] ARM, irq: " Jiang Liu
2015-06-04 4:13 ` [RFT v2 10/48] irqchip: " Jiang Liu
2015-06-04 4:50 ` Krzysztof Kozlowski
2015-07-11 21:39 ` [tip:irq/core] " tip-bot for Jiang Liu
2015-06-04 4:13 ` [RFT v2 11/48] ipu: " Jiang Liu
2015-06-08 11:16 ` Vinod Koul
2015-06-08 11:37 ` Jiang Liu
2015-06-04 4:13 ` [RFT v2 12/48] sh: intc: " Jiang Liu
2015-06-04 4:13 ` [RFT v2 13/48] keystone, irq: Use irq_data_get_xxx() to avoid redundant lookup of irq_data Jiang Liu
2015-06-04 4:13 ` [RFT v2 14/48] spmi: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc Jiang Liu
2015-06-04 4:13 ` [RFT v2 15/48] genirq: Kill the parameter 'irq' of kstat_incr_irqs_this_cpu() Jiang Liu
2015-07-11 21:31 ` [tip:irq/core] genirq: Remove " tip-bot for Jiang Liu
2015-06-04 4:13 ` [RFT v2 16/48] genirq: Introduce helper irq_desc_get_irq() Jiang Liu
2015-06-26 19:50 ` [tip:irq/urgent] " tip-bot for Jiang Liu
2015-06-04 4:13 ` [RFT v2 17/48] genirq: Kill the parameter 'irq' of check_irq_resend() Jiang Liu
2015-07-11 21:31 ` tip-bot for Jiang Liu [this message]
2015-06-04 4:13 ` [RFT v2 18/48] genirq: Kill the parameter 'irq' of note_interrupt() Jiang Liu
2015-07-11 21:33 ` [tip:irq/core] genirq: Remove the irq argument from note_interrupt() tip-bot for Jiang Liu
2015-06-04 4:13 ` [RFT v2 19/48] genirq: Change prototypes of register_irq_proc() and friends Jiang Liu
2015-06-04 4:13 ` [RFT v2 20/48] genirq: Kill the parameter 'irq' of setup_affinity() Jiang Liu
2015-07-11 21:34 ` [tip:irq/core] genirq: Remove the irq argument from setup_affinity() tip-bot for Jiang Liu
2015-06-04 4:13 ` [RFT v2 21/48] ARM, irq: Prepare for killing the first parameter 'irq' of irq_flow_handler_t Jiang Liu
2015-06-04 4:13 ` [RFT v2 22/48] blackfin, " Jiang Liu
2015-06-04 4:13 ` [RFT v2 23/48] c6x, " Jiang Liu
2015-06-05 14:14 ` Mark Salter
2015-06-04 4:13 ` [RFT v2 24/48] m68k, " Jiang Liu
2015-06-04 4:13 ` [RFT v2 25/48] mips, " Jiang Liu
2015-06-05 8:34 ` Ralf Baechle
2015-06-04 4:13 ` [RFT v2 26/48] powerpc, " Jiang Liu
2015-06-04 4:13 ` [RFT v2 27/48] sh, " Jiang Liu
2015-06-04 4:13 ` [RFT v2 28/48] unicore32, " Jiang Liu
2015-06-04 4:13 ` [RFT v2 29/48] ipu: " Jiang Liu
2015-06-04 4:13 ` [RFT v2 30/48] gpio: " Jiang Liu
2015-06-04 11:27 ` Linus Walleij
2015-06-04 4:13 ` [RFT v2 31/48] irqchip: " Jiang Liu
2015-06-05 8:36 ` Ralf Baechle
2015-06-04 4:13 ` [RFT v2 32/48] mfd: " Jiang Liu
2015-06-04 7:14 ` Lee Jones
2015-06-04 4:13 ` [RFT v2 33/48] PCI/keystone: " Jiang Liu
2015-06-04 4:13 ` [RFT v2 34/48] pinctrl: " Jiang Liu
2015-06-10 8:39 ` Heiko Stübner
2015-06-10 13:14 ` Linus Walleij
2015-06-04 4:13 ` [RFT v2 35/48] genirq: Kill " Jiang Liu
2015-06-04 4:13 ` [RFT v2 36/48] genirq, arm: " Jiang Liu
2015-06-04 4:52 ` Krzysztof Kozlowski
2015-06-04 4:13 ` [RFT v2 37/48] genirq, blackfin: " Jiang Liu
2015-06-04 4:13 ` [RFT v2 38/48] genirq, powerpc: " Jiang Liu
2015-06-04 4:13 ` [RFT v2 39/48] genirq, mips: " Jiang Liu
2015-06-04 12:21 ` Sergey Ryazanov
2015-06-04 4:13 ` [RFT v2 40/48] genirq, m68k: " Jiang Liu
2015-06-04 4:13 ` [RFT v2 41/48] genirq, x86: " Jiang Liu
2015-06-04 4:13 ` [RFT v2 42/48] genirq, sh: " Jiang Liu
2015-06-04 4:13 ` [RFT v2 43/48] genirq, arch: " Jiang Liu
2015-06-05 14:16 ` Mark Salter
2015-06-04 4:13 ` [RFT v2 44/48] genirq, pinctrl: " Jiang Liu
2015-06-10 8:40 ` Heiko Stübner
2015-06-04 4:13 ` [RFT v2 45/48] genirq, gpio: " Jiang Liu
2015-06-04 6:20 ` Javier Martinez Canillas
2015-06-04 11:28 ` Linus Walleij
2015-06-04 4:13 ` [RFT v2 46/48] genirq, irqchip: " Jiang Liu
2015-06-04 4:52 ` Krzysztof Kozlowski
2015-06-04 4:13 ` [RFT v2 47/48] genirq, mfd: " Jiang Liu
2015-06-04 4:13 ` [RFT v2 48/48] genirq, drivers: " Jiang Liu
2015-06-04 6:59 ` [RFT v2 00/48] Refine irq interfaces to reduce number of parameters Geert Uytterhoeven
2015-06-04 7:23 ` Jiang Liu
2015-06-05 3:53 ` Fengguang Wu
2015-06-05 0:22 ` Daniel Axtens
2015-06-05 1:15 ` Jiang Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-0798abeb7eec37dcc20f252c2195fc31c41561f9@git.kernel.org \
--to=tipbot@zytor.com \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=jiang.liu@linux.intel.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=rdunlap@infradead.org \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=yinghai@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Powered by JetHome