From: tip-bot for Jiang Liu <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: mingo@kernel.org, hpa@zytor.com, tglx@linutronix.de,
bp@alien8.de, benh@kernel.crashing.org, yinghai@kernel.org,
jiang.liu@linux.intel.com, linux-kernel@vger.kernel.org,
bhelgaas@google.com, rdunlap@infradead.org,
konrad.wilk@oracle.com, tony.luck@intel.com
Subject: [tip:irq/core] genirq: Remove the parameter 'irq' of kstat_incr_irqs_this_cpu()
Date: Sat, 11 Jul 2015 14:31:36 -0700 [thread overview]
Message-ID: <tip-b51bf95c583bba645974348666e9b5a14c7aa3ea@git.kernel.org> (raw)
In-Reply-To: <1433391238-19471-16-git-send-email-jiang.liu@linux.intel.com>
Commit-ID: b51bf95c583bba645974348666e9b5a14c7aa3ea
Gitweb: http://git.kernel.org/tip/b51bf95c583bba645974348666e9b5a14c7aa3ea
Author: Jiang Liu <jiang.liu@linux.intel.com>
AuthorDate: Thu, 4 Jun 2015 12:13:25 +0800
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Sat, 11 Jul 2015 23:14:24 +0200
genirq: Remove the parameter 'irq' of kstat_incr_irqs_this_cpu()
The first parameter 'irq' is never used by
kstat_incr_irqs_this_cpu(). Remove it.
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-16-git-send-email-jiang.liu@linux.intel.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
kernel/irq/chip.c | 16 ++++++++--------
kernel/irq/handle.c | 2 +-
kernel/irq/internals.h | 2 +-
kernel/irq/irqdesc.c | 2 +-
4 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
index 27f4332..f3c3d55 100644
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@ -315,7 +315,7 @@ void handle_nested_irq(unsigned int irq)
raw_spin_lock_irq(&desc->lock);
desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);
- kstat_incr_irqs_this_cpu(irq, desc);
+ kstat_incr_irqs_this_cpu(desc);
action = desc->action;
if (unlikely(!action || irqd_irq_disabled(&desc->irq_data))) {
@@ -391,7 +391,7 @@ handle_simple_irq(unsigned int irq, struct irq_desc *desc)
goto out_unlock;
desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);
- kstat_incr_irqs_this_cpu(irq, desc);
+ kstat_incr_irqs_this_cpu(desc);
if (unlikely(!desc->action || irqd_irq_disabled(&desc->irq_data))) {
desc->istate |= IRQS_PENDING;
@@ -443,7 +443,7 @@ handle_level_irq(unsigned int irq, struct irq_desc *desc)
goto out_unlock;
desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);
- kstat_incr_irqs_this_cpu(irq, desc);
+ kstat_incr_irqs_this_cpu(desc);
/*
* If its disabled or no action available
@@ -515,7 +515,7 @@ handle_fasteoi_irq(unsigned int irq, struct irq_desc *desc)
goto out;
desc->istate &= ~(IRQS_REPLAY | IRQS_WAITING);
- kstat_incr_irqs_this_cpu(irq, desc);
+ kstat_incr_irqs_this_cpu(desc);
/*
* If its disabled or no action available
@@ -583,7 +583,7 @@ handle_edge_irq(unsigned int irq, struct irq_desc *desc)
goto out_unlock;
}
- kstat_incr_irqs_this_cpu(irq, desc);
+ kstat_incr_irqs_this_cpu(desc);
/* Start handling the irq */
desc->irq_data.chip->irq_ack(&desc->irq_data);
@@ -646,7 +646,7 @@ void handle_edge_eoi_irq(unsigned int irq, struct irq_desc *desc)
goto out_eoi;
}
- kstat_incr_irqs_this_cpu(irq, desc);
+ kstat_incr_irqs_this_cpu(desc);
do {
if (unlikely(!desc->action))
@@ -675,7 +675,7 @@ handle_percpu_irq(unsigned int irq, struct irq_desc *desc)
{
struct irq_chip *chip = irq_desc_get_chip(desc);
- kstat_incr_irqs_this_cpu(irq, desc);
+ kstat_incr_irqs_this_cpu(desc);
if (chip->irq_ack)
chip->irq_ack(&desc->irq_data);
@@ -705,7 +705,7 @@ void handle_percpu_devid_irq(unsigned int irq, struct irq_desc *desc)
void *dev_id = raw_cpu_ptr(action->percpu_dev_id);
irqreturn_t res;
- kstat_incr_irqs_this_cpu(irq, desc);
+ kstat_incr_irqs_this_cpu(desc);
if (chip->irq_ack)
chip->irq_ack(&desc->irq_data);
diff --git a/kernel/irq/handle.c b/kernel/irq/handle.c
index 6354802..4d37b96 100644
--- a/kernel/irq/handle.c
+++ b/kernel/irq/handle.c
@@ -30,7 +30,7 @@
void handle_bad_irq(unsigned int irq, struct irq_desc *desc)
{
print_irq_desc(irq, desc);
- kstat_incr_irqs_this_cpu(irq, desc);
+ kstat_incr_irqs_this_cpu(desc);
ack_bad_irq(irq);
}
diff --git a/kernel/irq/internals.h b/kernel/irq/internals.h
index 4834ee8..3e03824 100644
--- a/kernel/irq/internals.h
+++ b/kernel/irq/internals.h
@@ -191,7 +191,7 @@ static inline bool irqd_has_set(struct irq_data *d, unsigned int mask)
return __irqd_to_state(d) & mask;
}
-static inline void kstat_incr_irqs_this_cpu(unsigned int irq, struct irq_desc *desc)
+static inline void kstat_incr_irqs_this_cpu(struct irq_desc *desc)
{
__this_cpu_inc(*desc->kstat_irqs);
__this_cpu_inc(kstat.irqs_sum);
diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c
index 4afc457..0a2a4b6 100644
--- a/kernel/irq/irqdesc.c
+++ b/kernel/irq/irqdesc.c
@@ -582,7 +582,7 @@ int irq_set_percpu_devid(unsigned int irq)
void kstat_incr_irq_this_cpu(unsigned int irq)
{
- kstat_incr_irqs_this_cpu(irq, irq_to_desc(irq));
+ kstat_incr_irqs_this_cpu(irq_to_desc(irq));
}
/**
next prev parent reply other threads:[~2015-07-11 21:32 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-bot for Jiang Liu [this message]
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:irq/core] genirq: Remove the irq argument from check_irq_resend() tip-bot for Jiang Liu
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-b51bf95c583bba645974348666e9b5a14c7aa3ea@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