From: Jiang Liu <jiang.liu@linux.intel.com>
To: Thomas Gleixner <tglx@linutronix.de>,
Bjorn Helgaas <bhelgaas@google.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Ingo Molnar <mingo@redhat.com>, "H. Peter Anvin" <hpa@zytor.com>,
Randy Dunlap <rdunlap@infradead.org>,
Yinghai Lu <yinghai@kernel.org>, Borislav Petkov <bp@alien8.de>,
Samuel Ortiz <sameo@linux.intel.com>,
Lee Jones <lee.jones@linaro.org>,
Tony Lindgren <tony@atomide.com>
Cc: Jiang Liu <jiang.liu@linux.intel.com>,
Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>,
Tony Luck <tony.luck@intel.com>,
x86@kernel.org, linux-kernel@vger.kernel.org,
linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org,
linux-omap@vger.kernel.org
Subject: [RFT v2 08/48] mfd: Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc
Date: Thu, 4 Jun 2015 12:13:18 +0800 [thread overview]
Message-ID: <1433391238-19471-9-git-send-email-jiang.liu@linux.intel.com> (raw)
In-Reply-To: <1433391238-19471-1-git-send-email-jiang.liu@linux.intel.com>
Use irq_desc_get_xxx() to avoid redundant lookup of irq_desc while we
already have a pointer to corresponding irq_desc.
Do the same thing to avoid pattern "irq_get_chip_data(data->irq)".
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Acked-by: Lee Jones <lee.jones@linaro.org>
---
drivers/mfd/ezx-pcap.c | 2 +-
drivers/mfd/max8997-irq.c | 8 ++++----
drivers/mfd/mt6397-core.c | 8 ++++----
drivers/mfd/t7l66xb.c | 2 +-
drivers/mfd/tc6393xb.c | 2 +-
drivers/mfd/twl6030-irq.c | 2 +-
6 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/mfd/ezx-pcap.c b/drivers/mfd/ezx-pcap.c
index 5991faddd3c6..e5f4ffaa5414 100644
--- a/drivers/mfd/ezx-pcap.c
+++ b/drivers/mfd/ezx-pcap.c
@@ -207,7 +207,7 @@ static void pcap_isr_work(struct work_struct *work)
static void pcap_irq_handler(unsigned int irq, struct irq_desc *desc)
{
- struct pcap_chip *pcap = irq_get_handler_data(irq);
+ struct pcap_chip *pcap = irq_desc_get_handler_data(desc);
desc->irq_data.chip->irq_ack(&desc->irq_data);
queue_work(pcap->workqueue, &pcap->isr_work);
diff --git a/drivers/mfd/max8997-irq.c b/drivers/mfd/max8997-irq.c
index 43fa61413e93..381738b477f8 100644
--- a/drivers/mfd/max8997-irq.c
+++ b/drivers/mfd/max8997-irq.c
@@ -113,14 +113,14 @@ static const struct max8997_irq_data max8997_irqs[] = {
static void max8997_irq_lock(struct irq_data *data)
{
- struct max8997_dev *max8997 = irq_get_chip_data(data->irq);
+ struct max8997_dev *max8997 = irq_data_get_irq_chip_data(data);
mutex_lock(&max8997->irqlock);
}
static void max8997_irq_sync_unlock(struct irq_data *data)
{
- struct max8997_dev *max8997 = irq_get_chip_data(data->irq);
+ struct max8997_dev *max8997 = irq_data_get_irq_chip_data(data);
int i;
for (i = 0; i < MAX8997_IRQ_GROUP_NR; i++) {
@@ -148,7 +148,7 @@ irq_to_max8997_irq(struct max8997_dev *max8997, int irq)
static void max8997_irq_mask(struct irq_data *data)
{
- struct max8997_dev *max8997 = irq_get_chip_data(data->irq);
+ struct max8997_dev *max8997 = irq_data_get_irq_chip_data(data);
const struct max8997_irq_data *irq_data = irq_to_max8997_irq(max8997,
data->irq);
@@ -157,7 +157,7 @@ static void max8997_irq_mask(struct irq_data *data)
static void max8997_irq_unmask(struct irq_data *data)
{
- struct max8997_dev *max8997 = irq_get_chip_data(data->irq);
+ struct max8997_dev *max8997 = irq_data_get_irq_chip_data(data);
const struct max8997_irq_data *irq_data = irq_to_max8997_irq(max8997,
data->irq);
diff --git a/drivers/mfd/mt6397-core.c b/drivers/mfd/mt6397-core.c
index 09bc7804952a..dab325b9d0df 100644
--- a/drivers/mfd/mt6397-core.c
+++ b/drivers/mfd/mt6397-core.c
@@ -39,14 +39,14 @@ static const struct mfd_cell mt6397_devs[] = {
static void mt6397_irq_lock(struct irq_data *data)
{
- struct mt6397_chip *mt6397 = irq_get_chip_data(data->irq);
+ struct mt6397_chip *mt6397 = irq_data_get_irq_chip_data(data);
mutex_lock(&mt6397->irqlock);
}
static void mt6397_irq_sync_unlock(struct irq_data *data)
{
- struct mt6397_chip *mt6397 = irq_get_chip_data(data->irq);
+ struct mt6397_chip *mt6397 = irq_data_get_irq_chip_data(data);
regmap_write(mt6397->regmap, MT6397_INT_CON0, mt6397->irq_masks_cur[0]);
regmap_write(mt6397->regmap, MT6397_INT_CON1, mt6397->irq_masks_cur[1]);
@@ -56,7 +56,7 @@ static void mt6397_irq_sync_unlock(struct irq_data *data)
static void mt6397_irq_disable(struct irq_data *data)
{
- struct mt6397_chip *mt6397 = irq_get_chip_data(data->irq);
+ struct mt6397_chip *mt6397 = irq_data_get_irq_chip_data(data);
int shift = data->hwirq & 0xf;
int reg = data->hwirq >> 4;
@@ -65,7 +65,7 @@ static void mt6397_irq_disable(struct irq_data *data)
static void mt6397_irq_enable(struct irq_data *data)
{
- struct mt6397_chip *mt6397 = irq_get_chip_data(data->irq);
+ struct mt6397_chip *mt6397 = irq_data_get_irq_chip_data(data);
int shift = data->hwirq & 0xf;
int reg = data->hwirq >> 4;
diff --git a/drivers/mfd/t7l66xb.c b/drivers/mfd/t7l66xb.c
index c09fb5dccd50..b752ca2be549 100644
--- a/drivers/mfd/t7l66xb.c
+++ b/drivers/mfd/t7l66xb.c
@@ -187,7 +187,7 @@ static struct mfd_cell t7l66xb_cells[] = {
/* Handle the T7L66XB interrupt mux */
static void t7l66xb_irq(unsigned int irq, struct irq_desc *desc)
{
- struct t7l66xb *t7l66xb = irq_get_handler_data(irq);
+ struct t7l66xb *t7l66xb = irq_desc_get_handler_data(desc);
unsigned int isr;
unsigned int i, irq_base;
diff --git a/drivers/mfd/tc6393xb.c b/drivers/mfd/tc6393xb.c
index 63458b39a97d..d21253a51cff 100644
--- a/drivers/mfd/tc6393xb.c
+++ b/drivers/mfd/tc6393xb.c
@@ -525,7 +525,7 @@ static int tc6393xb_register_gpio(struct tc6393xb *tc6393xb, int gpio_base)
static void
tc6393xb_irq(unsigned int irq, struct irq_desc *desc)
{
- struct tc6393xb *tc6393xb = irq_get_handler_data(irq);
+ struct tc6393xb *tc6393xb = irq_desc_get_handler_data(desc);
unsigned int isr;
unsigned int i, irq_base;
diff --git a/drivers/mfd/twl6030-irq.c b/drivers/mfd/twl6030-irq.c
index 2807e1a95663..5b8cd5cd42cf 100644
--- a/drivers/mfd/twl6030-irq.c
+++ b/drivers/mfd/twl6030-irq.c
@@ -231,7 +231,7 @@ static irqreturn_t twl6030_irq_thread(int irq, void *data)
static int twl6030_irq_set_wake(struct irq_data *d, unsigned int on)
{
- struct twl6030_irq *pdata = irq_get_chip_data(d->irq);
+ struct twl6030_irq *pdata = irq_data_get_irq_chip_data(d);
if (on)
atomic_inc(&pdata->wakeirqs);
--
1.7.10.4
next prev parent reply other threads:[~2015-06-04 4:13 UTC|newest]
Thread overview: 76+ 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-04 4:13 ` [RFT v2 02/48] genirq: Kill never used irq_node() 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 ` Jiang Liu [this message]
2015-06-04 4:13 ` [RFT v2 09/48] ARM, " Jiang Liu
2015-06-04 4:13 ` [RFT v2 10/48] irqchip: " Jiang Liu
2015-06-04 4:50 ` Krzysztof Kozlowski
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-06-04 4:13 ` [RFT v2 16/48] genirq: Introduce helper irq_desc_get_irq() Jiang Liu
2015-06-04 4:13 ` [RFT v2 17/48] genirq: Kill the parameter 'irq' of check_irq_resend() Jiang Liu
2015-06-04 4:13 ` [RFT v2 18/48] genirq: Kill the parameter 'irq' of note_interrupt() 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-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=1433391238-19471-9-git-send-email-jiang.liu@linux.intel.com \
--to=jiang.liu@linux.intel.com \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=konrad.wilk@oracle.com \
--cc=lee.jones@linaro.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-omap@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rdunlap@infradead.org \
--cc=sameo@linux.intel.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--cc=tony@atomide.com \
--cc=x86@kernel.org \
--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;
as well as URLs for NNTP newsgroup(s).