PCI/MSI: Rename __read_msi_msg() to __pci_read_msi_msg()

Rename __read_msi_msg() to __pci_read_msi_msg() and kill unused
read_msi_msg(). It's a preparation to separate generic MSI code from
PCI core.

Signed-off-by: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Grant Likely <grant.likely@linaro.org>
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Yingjoe Chen <yingjoe.chen@mediatek.com>
Cc: Yijing Wang <wangyijing@huawei.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

diff --git a/arch/powerpc/platforms/pseries/msi.c b/arch/powerpc/platforms/pseries/msi.c
index 8ab5add4ac824f43c6a6b299b24ed15bf0deafb2..90f756d0f58ff636e4beaacfcdcaad254cc66fde 100644 (file)
--- a/arch/powerpc/platforms/pseries/msi.c
+++ b/arch/powerpc/platforms/pseries/msi.c
@@ -476,7 +476,7 @@ again:
                irq_set_msi_desc(virq, entry);
 
                /* Read config space back so we can restore after reset */
-               __read_msi_msg(entry, &msg);
+               __pci_read_msi_msg(entry, &msg);
                entry->msg = msg;
        }
 

diff --git a/arch/x86/pci/xen.c b/arch/x86/pci/xen.c
index 466b978e13a54d379a73d227e4b1cda83b7c45da..ff0068b8ce5e230fc291bac3fc4a74b12e73cab5 100644 (file)
--- a/arch/x86/pci/xen.c
+++ b/arch/x86/pci/xen.c
@@ -229,7 +229,7 @@ static int xen_hvm_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
                return 1;
 
        list_for_each_entry(msidesc, &dev->msi_list, list) {
-               __read_msi_msg(msidesc, &msg);
+               __pci_read_msi_msg(msidesc, &msg);
                pirq = MSI_ADDR_EXT_DEST_ID(msg.address_hi) |
                        ((msg.address_lo >> MSI_ADDR_DEST_ID_SHIFT) & 0xff);
                if (msg.data != XEN_PIRQ_MSI_DATA ||

diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c
index 5cb471ec3e61f83d84683c92015383eb73cb378c..c77adc735f8adb8dbcde63174920ee736019c1bb 100644 (file)
--- a/drivers/pci/msi.c
+++ b/drivers/pci/msi.c
@@ -252,7 +252,7 @@ void default_restore_msi_irqs(struct pci_dev *dev)
                default_restore_msi_irq(dev, entry->irq);
 }
 
-void __read_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
+void __pci_read_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
 {
        BUG_ON(entry->dev->current_state != PCI_D0);
 
@@ -282,13 +282,6 @@ void __read_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
        }
 }
 
-void read_msi_msg(unsigned int irq, struct msi_msg *msg)
-{
-       struct msi_desc *entry = irq_get_msi_desc(irq);
-
-       __read_msi_msg(entry, msg);
-}
-
 void __get_cached_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
 {
        /* Assert that the cache is valid, assuming that

diff --git a/include/linux/msi.h b/include/linux/msi.h
index 6704991b0174c121163488deab4e286c197cf2da..f36c37b46f100660f0887ef011c292c951b7ba95 100644 (file)
--- a/include/linux/msi.h
+++ b/include/linux/msi.h
@@ -16,12 +16,11 @@ struct irq_data;
 struct msi_desc;
 void mask_msi_irq(struct irq_data *data);
 void unmask_msi_irq(struct irq_data *data);
-void __read_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
 void __get_cached_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
 void __write_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
-void read_msi_msg(unsigned int irq, struct msi_msg *msg);
 void get_cached_msi_msg(unsigned int irq, struct msi_msg *msg);
 void write_msi_msg(unsigned int irq, struct msi_msg *msg);
+
 u32 __msix_mask_irq(struct msi_desc *desc, u32 flag);
 u32 __msi_mask_irq(struct msi_desc *desc, u32 mask, u32 flag);
 
@@ -51,6 +50,8 @@ struct msi_desc {
        struct msi_msg msg;
 };
 
+void __pci_read_msi_msg(struct msi_desc *entry, struct msi_msg *msg);
+
 /*
  * The arch hooks to setup up msi irqs. Those functions are
  * implemented as weak symbols so that they /can/ be overriden by