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>,
Jingoo Han <jingoohan1@gmail.com>,
Jiang Liu <jiang.liu@linux.intel.com>,
Jason Cooper <jason@lakedaemon.net>,
Kevin Cernekee <cernekee@gmail.com>,
Arnd Bergmann <arnd@arndb.de>
Cc: 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
Subject: [Patch v3 32/36] genirq: Rename irq_data_get_msi() as irq_data_get_msi_desc()
Date: Mon, 1 Jun 2015 16:05:41 +0800 [thread overview]
Message-ID: <1433145945-789-33-git-send-email-jiang.liu@linux.intel.com> (raw)
In-Reply-To: <1433145945-789-1-git-send-email-jiang.liu@linux.intel.com>
Rename irq_data_get_msi() as irq_data_get_msi_desc() to keep consistency
with other irq_data access helpers.
Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Acked-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/host/pcie-designware.c | 2 +-
drivers/pci/msi.c | 2 +-
include/linux/irq.h | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c
index 2e9f84fdd9ce..7b3432d331fd 100644
--- a/drivers/pci/host/pcie-designware.c
+++ b/drivers/pci/host/pcie-designware.c
@@ -309,7 +309,7 @@ static int dw_msi_setup_irq(struct msi_controller *chip, struct pci_dev *pdev,
static void dw_msi_teardown_irq(struct msi_controller *chip, unsigned int irq)
{
struct irq_data *data = irq_get_irq_data(irq);
- struct msi_desc *msi = irq_data_get_msi(data);
+ struct msi_desc *msi = irq_data_get_msi_desc(data);
struct pcie_port *pp = sys_to_pcie(msi->dev->bus->sysdata);
clear_irq_range(pp, irq, 1, data->hwirq);
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index c3e7dfcf9ff5..be6034cf5c21 100644
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -270,7 +270,7 @@ static void msix_mask_irq(struct msi_desc *desc, u32 flag)
static void msi_set_mask_bit(struct irq_data *data, u32 flag)
{
- struct msi_desc *desc = irq_data_get_msi(data);
+ struct msi_desc *desc = irq_data_get_msi_desc(data);
if (desc->msi_attrib.is_msix) {
msix_mask_irq(desc, flag);
diff --git a/include/linux/irq.h b/include/linux/irq.h
index 9d01cd8ca8a2..2b95fee48c55 100644
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -631,7 +631,7 @@ static inline struct msi_desc *irq_get_msi_desc(unsigned int irq)
return d ? d->msi_desc : NULL;
}
-static inline struct msi_desc *irq_data_get_msi(struct irq_data *d)
+static inline struct msi_desc *irq_data_get_msi_desc(struct irq_data *d)
{
return d->msi_desc;
}
--
1.7.10.4
next prev parent reply other threads:[~2015-06-01 8:05 UTC|newest]
Thread overview: 49+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-06-01 8:05 [Patch v3 00/36] Split struct irq_data into common part and per-chip part Jiang Liu
2015-06-01 8:05 ` [Patch v3 01/36] genirq: Enhance irq_data_to_desc() to support hierarchy irqdomain Jiang Liu
2015-06-01 8:05 ` [Patch v3 02/36] genirq: Fix crash caused by irq_move_irq() when hierarch irqdomain is enabled Jiang Liu
2015-06-01 8:05 ` [Patch v3 03/36] genirq: Introduce struct irq_common_data to host shared irq data Jiang Liu
2015-06-01 8:05 ` [Patch v3 04/36] genirq: Introduce helper function irq_data_get_node() Jiang Liu
2015-06-01 8:05 ` [Patch v3 05/36] x86, irq: Use accessor irq_data_get_node() to hide struct irq_data detail Jiang Liu
2015-06-01 8:05 ` [Patch v3 06/36] sh, " Jiang Liu
2015-06-01 8:05 ` [Patch v3 07/36] genirq: Move field 'node' from struct irq_data into struct irq_common_data Jiang Liu
2015-06-01 8:05 ` [Patch v3 08/36] sparc, irq: Use helper irq_data_get_irq_handler_data() to hide irq_desc details Jiang Liu
2015-06-01 8:05 ` [Patch v3 09/36] x86, " Jiang Liu
2015-06-01 8:05 ` [Patch v3 10/36] " Jiang Liu
2015-06-01 8:05 ` [Patch v3 11/36] sh, " Jiang Liu
2015-06-01 11:38 ` Sergei Shtylyov
2015-06-01 13:53 ` Jiang Liu
2015-06-01 8:05 ` [Patch v3 12/36] genirq: Move field 'handler_data' from struct irq_data into struct irq_common_data Jiang Liu
2015-06-01 8:05 ` [Patch v3 13/36] mn10300: Fix incorrect use of data->affinity Jiang Liu
2015-06-01 8:05 ` [Patch v3 14/36] genirq: Introduce helper function irq_data_get_affinity_mask() Jiang Liu
2015-06-01 8:05 ` [Patch v3 15/36] alpha, irq: Use access helper irq_data_get_affinity_mask() Jiang Liu
2015-06-01 8:05 ` [Patch v3 16/36] ARM, " Jiang Liu
2015-06-01 8:05 ` [Patch v3 17/36] ARM64, " Jiang Liu
2015-06-02 6:25 ` Hanjun Guo
2015-06-01 8:05 ` [Patch v3 18/36] blackfin, " Jiang Liu
2015-06-01 8:05 ` [Patch v3 19/36] IA64, " Jiang Liu
2015-06-01 8:05 ` [Patch v3 20/36] metag, " Jiang Liu
2015-06-01 8:05 ` [Patch v3 21/36] mips, " Jiang Liu
2015-06-05 8:46 ` Ralf Baechle
2015-06-01 8:05 ` [Patch v3 22/36] mn10300, " Jiang Liu
2015-06-01 8:05 ` [Patch v3 23/36] parisc, " Jiang Liu
2015-06-01 8:05 ` [Patch v3 24/36] powerpc, " Jiang Liu
2015-06-01 8:05 ` [Patch v3 25/36] sh, " Jiang Liu
2015-06-01 8:05 ` [Patch v3 26/36] sparc, " Jiang Liu
2015-06-01 8:05 ` [Patch v3 27/36] x86, " Jiang Liu
2015-06-02 19:19 ` Thomas Gleixner
2015-06-03 1:53 ` Jiang Liu
2015-06-03 3:46 ` Jiang Liu
2015-06-01 8:05 ` [Patch v3 28/36] xtensa, " Jiang Liu
2015-06-01 8:05 ` [Patch v3 29/36] irqchip, " Jiang Liu
2015-06-01 8:05 ` [Patch v3 30/36] net/mlx4: Cache irq_desc->affinity instead of irq_desc Jiang Liu
2015-06-01 8:05 ` [Patch v3 31/36] genirq: Move field 'affinity' from struct irq_data into struct irq_common_data Jiang Liu
2015-06-03 3:47 ` Jiang Liu
2015-06-01 8:05 ` Jiang Liu [this message]
2015-06-01 8:05 ` [Patch v3 33/36] genirq: Use helper function to access irq_data->msi_desc Jiang Liu
2015-06-02 3:45 ` [v3,33/36] " Michael Ellerman
2015-06-02 5:46 ` Jiang Liu
2015-06-03 16:53 ` Thomas Gleixner
2015-06-01 8:05 ` [Patch v3 34/36] genirq: Move field 'msi_desc' from struct irq_data into struct irq_common_data Jiang Liu
2015-06-01 8:05 ` [Patch v3 35/36] genirq: Pass irq_data to helper function __irq_set_chip_handler_name_locked() Jiang Liu
2015-06-05 8:48 ` Ralf Baechle
2015-06-01 8:05 ` [Patch v3 36/36] genirq: Optimize irq_data_to_desc() to avoid irq_to_desc() lookup 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=1433145945-789-33-git-send-email-jiang.liu@linux.intel.com \
--to=jiang.liu@linux.intel.com \
--cc=arnd@arndb.de \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=bp@alien8.de \
--cc=cernekee@gmail.com \
--cc=hpa@zytor.com \
--cc=jason@lakedaemon.net \
--cc=jingoohan1@gmail.com \
--cc=konrad.wilk@oracle.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rdunlap@infradead.org \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.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).