PCI/MSI: Rename mask/unmask_msi_irq treewide

The PCI/MSI irq chip callbacks mask/unmask_msi_irq have been renamed
to pci_msi_mask/unmask_irq to mark them PCI specific. Rename all usage
sites. The conversion helper functions are kept around to avoid
conflicts in next and will be removed after merging into mainline.

Coccinelle assisted conversion. No functional change.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Bjorn Helgaas <bhelgaas@google.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Chris Metcalf <cmetcalf@tilera.com>
Cc: x86@kernel.org
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Jason Cooper <jason@lakedaemon.net>
Cc: Murali Karicheri <m-karicheri2@ti.com>
Cc: Thierry Reding <thierry.reding@gmail.com>
Cc: Mohit Kumar <mohit.kumar@st.com>
Cc: Simon Horman <horms@verge.net.au>
Cc: Michal Simek <michal.simek@xilinx.com>
Cc: Yijing Wang <wangyijing@huawei.com>

diff --git a/arch/arm/mach-iop13xx/msi.c b/arch/arm/mach-iop13xx/msi.c
index 3f7739cdb85be969c457adffc1e6971bb22500dc..9f89e76dfbb94a6ad27e4769545049726ae4c99b 100644 (file)
--- a/arch/arm/mach-iop13xx/msi.c
+++ b/arch/arm/mach-iop13xx/msi.c
@@ -126,10 +126,10 @@ static void iop13xx_msi_nop(struct irq_data *d)
 static struct irq_chip iop13xx_msi_chip = {
        .name = "PCI-MSI",
        .irq_ack = iop13xx_msi_nop,
-       .irq_enable = unmask_msi_irq,
-       .irq_disable = mask_msi_irq,
-       .irq_mask = mask_msi_irq,
-       .irq_unmask = unmask_msi_irq,
+       .irq_enable = pci_msi_unmask_irq,
+       .irq_disable = pci_msi_mask_irq,
+       .irq_mask = pci_msi_mask_irq,
+       .irq_unmask = pci_msi_unmask_irq,
 };
 
 int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)

diff --git a/arch/ia64/kernel/msi_ia64.c b/arch/ia64/kernel/msi_ia64.c
index 35b10dd2bb76a4513e986998554e892aaf8e8488..8ae36ea177d3eb97524f99a64897a2c5a4a2146e 100644 (file)
--- a/arch/ia64/kernel/msi_ia64.c
+++ b/arch/ia64/kernel/msi_ia64.c
@@ -102,8 +102,8 @@ static int ia64_msi_retrigger_irq(struct irq_data *data)
  */
 static struct irq_chip ia64_msi_chip = {
        .name                   = "PCI-MSI",
-       .irq_mask               = mask_msi_irq,
-       .irq_unmask             = unmask_msi_irq,
+       .irq_mask               = pci_msi_mask_irq,
+       .irq_unmask             = pci_msi_unmask_irq,
        .irq_ack                = ia64_ack_msi_irq,
 #ifdef CONFIG_SMP
        .irq_set_affinity       = ia64_set_msi_irq_affinity,

diff --git a/arch/ia64/sn/kernel/msi_sn.c b/arch/ia64/sn/kernel/msi_sn.c
index 433cafed5c3a62a8926a011fcd27ad4103b023f5..a0eb27b66d13c8aa88005066adaf8ef6bd2d314d 100644 (file)
--- a/arch/ia64/sn/kernel/msi_sn.c
+++ b/arch/ia64/sn/kernel/msi_sn.c
@@ -228,8 +228,8 @@ static int sn_msi_retrigger_irq(struct irq_data *data)
 
 static struct irq_chip sn_msi_chip = {
        .name                   = "PCI-MSI",
-       .irq_mask               = mask_msi_irq,
-       .irq_unmask             = unmask_msi_irq,
+       .irq_mask               = pci_msi_mask_irq,
+       .irq_unmask             = pci_msi_unmask_irq,
        .irq_ack                = sn_ack_msi_irq,
 #ifdef CONFIG_SMP
        .irq_set_affinity       = sn_set_msi_irq_affinity,

diff --git a/arch/mips/pci/msi-xlp.c b/arch/mips/pci/msi-xlp.c
index 81ea2b40db6143bf98e0389b602d2377d4311eb0..aa7dea3eb06415d4b16119cd5eba9e260ef3b0ae 100644 (file)
--- a/arch/mips/pci/msi-xlp.c
+++ b/arch/mips/pci/msi-xlp.c
@@ -217,7 +217,7 @@ static void xlp_msix_mask_ack(struct irq_data *d)
 
        msixvec = nlm_irq_msixvec(d->irq);
        link = nlm_irq_msixlink(msixvec);
-       mask_msi_irq(d);
+       pci_msi_mask_irq(d);
        md = irq_data_get_irq_handler_data(d);
 
        /* Ack MSI on bridge */
@@ -239,10 +239,10 @@ static void xlp_msix_mask_ack(struct irq_data *d)
 
 static struct irq_chip xlp_msix_chip = {
        .name           = "XLP-MSIX",
-       .irq_enable     = unmask_msi_irq,
-       .irq_disable    = mask_msi_irq,
+       .irq_enable     = pci_msi_unmask_irq,
+       .irq_disable    = pci_msi_mask_irq,
        .irq_mask_ack   = xlp_msix_mask_ack,
-       .irq_unmask     = unmask_msi_irq,
+       .irq_unmask     = pci_msi_unmask_irq,
 };
 
 void arch_teardown_msi_irq(unsigned int irq)

diff --git a/arch/powerpc/platforms/cell/axon_msi.c b/arch/powerpc/platforms/cell/axon_msi.c
index 26fa3432352e0545371bb0df983711a7857584a3..0883994df3845da247c111bab570f2eec7381786 100644 (file)
--- a/arch/powerpc/platforms/cell/axon_msi.c
+++ b/arch/powerpc/platforms/cell/axon_msi.c
@@ -301,9 +301,9 @@ static void axon_msi_teardown_msi_irqs(struct pci_dev *dev)
 }
 
 static struct irq_chip msic_irq_chip = {
-       .irq_mask       = mask_msi_irq,
-       .irq_unmask     = unmask_msi_irq,
-       .irq_shutdown   = mask_msi_irq,
+       .irq_mask       = pci_msi_mask_irq,
+       .irq_unmask     = pci_msi_unmask_irq,
+       .irq_shutdown   = pci_msi_mask_irq,
        .name           = "AXON-MSI",
 };
 

diff --git a/arch/powerpc/sysdev/fsl_msi.c b/arch/powerpc/sysdev/fsl_msi.c
index bd5a9f7c0029c0f4c5d1e6dd7a366990d196d573..19d4b2c3d7fdb1836c8b98902cf64770aa7689ea 100644 (file)
--- a/arch/powerpc/sysdev/fsl_msi.c
+++ b/arch/powerpc/sysdev/fsl_msi.c
@@ -82,8 +82,8 @@ static void fsl_msi_print_chip(struct irq_data *irqd, struct seq_file *p)
 
 
 static struct irq_chip fsl_msi_chip = {
-       .irq_mask       = mask_msi_irq,
-       .irq_unmask     = unmask_msi_irq,
+       .irq_mask       = pci_msi_mask_irq,
+       .irq_unmask     = pci_msi_unmask_irq,
        .irq_ack        = fsl_msi_end_irq,
        .irq_print_chip = fsl_msi_print_chip,
 };

diff --git a/arch/powerpc/sysdev/mpic_pasemi_msi.c b/arch/powerpc/sysdev/mpic_pasemi_msi.c
index 45a6f407883cfd153d9f0712ab39213eca6c8561..45c114bc430b6fec08fdf5bbe2cd8b696095ed28 100644 (file)
--- a/arch/powerpc/sysdev/mpic_pasemi_msi.c
+++ b/arch/powerpc/sysdev/mpic_pasemi_msi.c
@@ -42,7 +42,7 @@ static struct mpic *msi_mpic;
 static void mpic_pasemi_msi_mask_irq(struct irq_data *data)
 {
        pr_debug("mpic_pasemi_msi_mask_irq %d\n", data->irq);
-       mask_msi_irq(data);
+       pci_msi_mask_irq(data);
        mpic_mask_irq(data);
 }
 
@@ -50,7 +50,7 @@ static void mpic_pasemi_msi_unmask_irq(struct irq_data *data)
 {
        pr_debug("mpic_pasemi_msi_unmask_irq %d\n", data->irq);
        mpic_unmask_irq(data);
-       unmask_msi_irq(data);
+       pci_msi_unmask_irq(data);
 }
 
 static struct irq_chip mpic_pasemi_msi_chip = {

diff --git a/arch/powerpc/sysdev/mpic_u3msi.c b/arch/powerpc/sysdev/mpic_u3msi.c
index ac6f1f9d03ce801b11f4e1961d2c8f9d36a37a15..0dff1cd4448113ca0540713a24f87f45db159373 100644 (file)
--- a/arch/powerpc/sysdev/mpic_u3msi.c
+++ b/arch/powerpc/sysdev/mpic_u3msi.c
@@ -25,14 +25,14 @@ static struct mpic *msi_mpic;
 
 static void mpic_u3msi_mask_irq(struct irq_data *data)
 {
-       mask_msi_irq(data);
+       pci_msi_mask_irq(data);
        mpic_mask_irq(data);
 }
 
 static void mpic_u3msi_unmask_irq(struct irq_data *data)
 {
        mpic_unmask_irq(data);
-       unmask_msi_irq(data);
+       pci_msi_unmask_irq(data);
 }
 
 static struct irq_chip mpic_u3msi_chip = {

diff --git a/arch/powerpc/sysdev/xics/ics-opal.c b/arch/powerpc/sysdev/xics/ics-opal.c
index 3c6ee1b64e5d1eec2bf5d03679d537f1bc5c5d53..4ba554ec8eaffefd4ea9353429604134c1e3b0cf 100644 (file)
--- a/arch/powerpc/sysdev/xics/ics-opal.c
+++ b/arch/powerpc/sysdev/xics/ics-opal.c
@@ -73,7 +73,7 @@ static unsigned int ics_opal_startup(struct irq_data *d)
         * at that level, so we do it here by hand.
         */
        if (d->msi_desc)
-               unmask_msi_irq(d);
+               pci_msi_unmask_irq(d);
 #endif
 
        /* unmask it */

diff --git a/arch/powerpc/sysdev/xics/ics-rtas.c b/arch/powerpc/sysdev/xics/ics-rtas.c
index 936575d99c5c22df5a33187f3f2efa6b768298db..bc81335b2cbccbef965e7262d8472de7826ecdbc 100644 (file)
--- a/arch/powerpc/sysdev/xics/ics-rtas.c
+++ b/arch/powerpc/sysdev/xics/ics-rtas.c
@@ -76,7 +76,7 @@ static unsigned int ics_rtas_startup(struct irq_data *d)
         * at that level, so we do it here by hand.
         */
        if (d->msi_desc)
-               unmask_msi_irq(d);
+               pci_msi_unmask_irq(d);
 #endif
        /* unmask it */
        ics_rtas_unmask_irq(d);

diff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c
index fb54bbdbb48d51a6813a1a3a4002ffc188f706d5..d59c8256975040c12ded9cab5dea1d3bcb61f757 100644 (file)
--- a/arch/s390/pci/pci.c
+++ b/arch/s390/pci/pci.c
@@ -50,8 +50,8 @@ static DEFINE_SPINLOCK(zpci_list_lock);
 
 static struct irq_chip zpci_irq_chip = {
        .name = "zPCI",
-       .irq_unmask = unmask_msi_irq,
-       .irq_mask = mask_msi_irq,
+       .irq_unmask = pci_msi_unmask_irq,
+       .irq_mask = pci_msi_mask_irq,
 };
 
 static DECLARE_BITMAP(zpci_domain, ZPCI_NR_DEVICES);

diff --git a/arch/sparc/kernel/pci_msi.c b/arch/sparc/kernel/pci_msi.c
index 73db0ed80d831da54dfb3c9c76b21b83cced63ae..84e16d81a6d834470628c81386b54dd42a38c964 100644 (file)
--- a/arch/sparc/kernel/pci_msi.c
+++ b/arch/sparc/kernel/pci_msi.c
@@ -111,10 +111,10 @@ static void free_msi(struct pci_pbm_info *pbm, int msi_num)
 
 static struct irq_chip msi_irq = {
        .name           = "PCI-MSI",
-       .irq_mask       = mask_msi_irq,
-       .irq_unmask     = unmask_msi_irq,
-       .irq_enable     = unmask_msi_irq,
-       .irq_disable    = mask_msi_irq,
+       .irq_mask       = pci_msi_mask_irq,
+       .irq_unmask     = pci_msi_unmask_irq,
+       .irq_enable     = pci_msi_unmask_irq,
+       .irq_disable    = pci_msi_mask_irq,
        /* XXX affinity XXX */
 };
 

diff --git a/arch/tile/kernel/pci_gx.c b/arch/tile/kernel/pci_gx.c
index 376d9f1d99516a0004386b3906d94edec84b4145..e717af20dadafed0f8b4dcbc866f58f8b56df7af 100644 (file)
--- a/arch/tile/kernel/pci_gx.c
+++ b/arch/tile/kernel/pci_gx.c
@@ -1453,7 +1453,7 @@ static struct pci_ops tile_cfg_ops = {
 static unsigned int tilegx_msi_startup(struct irq_data *d)
 {
        if (d->msi_desc)
-               unmask_msi_irq(d);
+               pci_msi_unmask_irq(d);
 
        return 0;
 }
@@ -1465,14 +1465,14 @@ static void tilegx_msi_ack(struct irq_data *d)
 
 static void tilegx_msi_mask(struct irq_data *d)
 {
-       mask_msi_irq(d);
+       pci_msi_mask_irq(d);
        __insn_mtspr(SPR_IPI_MASK_SET_K, 1UL << d->irq);
 }
 
 static void tilegx_msi_unmask(struct irq_data *d)
 {
        __insn_mtspr(SPR_IPI_MASK_RESET_K, 1UL << d->irq);
-       unmask_msi_irq(d);
+       pci_msi_unmask_irq(d);
 }
 
 static struct irq_chip tilegx_msi_chip = {

diff --git a/arch/x86/kernel/apic/io_apic.c b/arch/x86/kernel/apic/io_apic.c
index d775aef42b87ff2889c891663021a56b56b5891b..7ffe0a2b870f030c055ffa6888df2f84480f404f 100644 (file)
--- a/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@ -3169,8 +3169,8 @@ msi_set_affinity(struct irq_data *data, const struct cpumask *mask, bool force)
  */
 static struct irq_chip msi_chip = {
        .name                   = "PCI-MSI",
-       .irq_unmask             = unmask_msi_irq,
-       .irq_mask               = mask_msi_irq,
+       .irq_unmask             = pci_msi_unmask_irq,
+       .irq_mask               = pci_msi_mask_irq,
        .irq_ack                = ack_apic_edge,
        .irq_set_affinity       = msi_set_affinity,
        .irq_retrigger          = ioapic_retrigger_irq,

diff --git a/drivers/irqchip/irq-armada-370-xp.c b/drivers/irqchip/irq-armada-370-xp.c
index 8c7f077abb0926929748b0cff699d532d1b839d1..1aeffcac66b851457401ea1fc2947f3fb88ca799 100644 (file)
--- a/drivers/irqchip/irq-armada-370-xp.c
+++ b/drivers/irqchip/irq-armada-370-xp.c
@@ -172,10 +172,10 @@ static void armada_370_xp_teardown_msi_irq(struct msi_controller *chip,
 
 static struct irq_chip armada_370_xp_msi_irq_chip = {
        .name = "armada_370_xp_msi_irq",
-       .irq_enable = unmask_msi_irq,
-       .irq_disable = mask_msi_irq,
-       .irq_mask = mask_msi_irq,
-       .irq_unmask = unmask_msi_irq,
+       .irq_enable = pci_msi_unmask_irq,
+       .irq_disable = pci_msi_mask_irq,
+       .irq_mask = pci_msi_mask_irq,
+       .irq_unmask = pci_msi_unmask_irq,
 };
 
 static int armada_370_xp_msi_map(struct irq_domain *domain, unsigned int virq,

diff --git a/drivers/pci/host/pci-keystone-dw.c b/drivers/pci/host/pci-keystone-dw.c
index ac3d08c4277018ce8539d4fcbe7d552213bba497..313338db0e43b858d83345773471a5773532c1fc 100644 (file)
--- a/drivers/pci/host/pci-keystone-dw.c
+++ b/drivers/pci/host/pci-keystone-dw.c
@@ -155,7 +155,7 @@ static void ks_dw_pcie_msi_irq_mask(struct irq_data *d)
        /* Mask the end point if PVM implemented */
        if (IS_ENABLED(CONFIG_PCI_MSI)) {
                if (msi->msi_attrib.maskbit)
-                       mask_msi_irq(d);
+                       pci_msi_mask_irq(d);
        }
 
        ks_dw_pcie_msi_clear_irq(pp, offset);
@@ -177,7 +177,7 @@ static void ks_dw_pcie_msi_irq_unmask(struct irq_data *d)
        /* Mask the end point if PVM implemented */
        if (IS_ENABLED(CONFIG_PCI_MSI)) {
                if (msi->msi_attrib.maskbit)
-                       unmask_msi_irq(d);
+                       pci_msi_unmask_irq(d);
        }
 
        ks_dw_pcie_msi_set_irq(pp, offset);

diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c
index 31841718bedd0d7304338d0867dc781f1361d675..adee80bc09c6283903d9341bc721511c4e2f46f7 100644 (file)
--- a/drivers/pci/host/pci-tegra.c
+++ b/drivers/pci/host/pci-tegra.c
@@ -1317,10 +1317,10 @@ static void tegra_msi_teardown_irq(struct msi_controller *chip,
 
 static struct irq_chip tegra_msi_irq_chip = {
        .name = "Tegra PCIe MSI",
-       .irq_enable = unmask_msi_irq,
-       .irq_disable = mask_msi_irq,
-       .irq_mask = mask_msi_irq,
-       .irq_unmask = unmask_msi_irq,
+       .irq_enable = pci_msi_unmask_irq,
+       .irq_disable = pci_msi_mask_irq,
+       .irq_mask = pci_msi_mask_irq,
+       .irq_unmask = pci_msi_unmask_irq,
 };
 
 static int tegra_msi_map(struct irq_domain *domain, unsigned int irq,

diff --git a/drivers/pci/host/pcie-designware.c b/drivers/pci/host/pcie-designware.c
index e03f4e7e1f7dfb854665d6230b3abac3700bf82f..17b51550f9b5a2b1ad240d8136afe3cf67c67fe5 100644 (file)
--- a/drivers/pci/host/pcie-designware.c
+++ b/drivers/pci/host/pcie-designware.c
@@ -152,10 +152,10 @@ static int dw_pcie_wr_own_conf(struct pcie_port *pp, int where, int size,
 
 static struct irq_chip dw_msi_irq_chip = {
        .name = "PCI-MSI",
-       .irq_enable = unmask_msi_irq,
-       .irq_disable = mask_msi_irq,
-       .irq_mask = mask_msi_irq,
-       .irq_unmask = unmask_msi_irq,
+       .irq_enable = pci_msi_unmask_irq,
+       .irq_disable = pci_msi_mask_irq,
+       .irq_mask = pci_msi_mask_irq,
+       .irq_unmask = pci_msi_unmask_irq,
 };
 
 /* MSI int handler */

diff --git a/drivers/pci/host/pcie-rcar.c b/drivers/pci/host/pcie-rcar.c
index c1177cd55ce3eb6830c82e52942e0e84e84efda9..d3053e53cf35084c826cc7831b88e59390d332cd 100644 (file)
--- a/drivers/pci/host/pcie-rcar.c
+++ b/drivers/pci/host/pcie-rcar.c
@@ -655,10 +655,10 @@ static void rcar_msi_teardown_irq(struct msi_controller *chip, unsigned int irq)
 
 static struct irq_chip rcar_msi_irq_chip = {
        .name = "R-Car PCIe MSI",
-       .irq_enable = unmask_msi_irq,
-       .irq_disable = mask_msi_irq,
-       .irq_mask = mask_msi_irq,
-       .irq_unmask = unmask_msi_irq,
+       .irq_enable = pci_msi_unmask_irq,
+       .irq_disable = pci_msi_mask_irq,
+       .irq_mask = pci_msi_mask_irq,
+       .irq_unmask = pci_msi_unmask_irq,
 };
 
 static int rcar_msi_map(struct irq_domain *domain, unsigned int irq,

diff --git a/drivers/pci/host/pcie-xilinx.c b/drivers/pci/host/pcie-xilinx.c
index 67683380f0f72e8044dcee3c37887e3f6c21c716..2f50fa5953fd22264209b4c7c0099e0bb8b9c7b8 100644 (file)
--- a/drivers/pci/host/pcie-xilinx.c
+++ b/drivers/pci/host/pcie-xilinx.c
@@ -389,10 +389,10 @@ static struct msi_controller xilinx_pcie_msi_chip = {
 /* HW Interrupt Chip Descriptor */
 static struct irq_chip xilinx_msi_irq_chip = {
        .name = "Xilinx PCIe MSI",
-       .irq_enable = unmask_msi_irq,
-       .irq_disable = mask_msi_irq,
-       .irq_mask = mask_msi_irq,
-       .irq_unmask = unmask_msi_irq,
+       .irq_enable = pci_msi_unmask_irq,
+       .irq_disable = pci_msi_mask_irq,
+       .irq_mask = pci_msi_mask_irq,
+       .irq_unmask = pci_msi_unmask_irq,
 };
 
 /**