genirq: Rename irq_data_get_msi() as irq_data_get_msi_desc()

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>
Cc: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c
index 69486be7181e18287a8a8bd421055b902233e3c4..85c7735d75119813738737f10f2906b3b4e99a0a 100644 (file)
--- a/drivers/pci/host/pcie-designware.c
+++ b/drivers/pci/host/pcie-designware.c
@@ -326,7 +326,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 f66be868ad2122efdb40e742f8ecb9fc43cbc508..64673f13bbb91aa47474e33affa7017c2de862d5 100644 (file)
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -249,7 +249,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 429ac266c7c64a6895639048bb9930c5bf019f2f..5284cb166d9073f6f3cfd534d2983aaca1790e06 100644 (file)
--- a/include/linux/irq.h
+++ b/include/linux/irq.h
@@ -638,7 +638,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;
 }