diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2014-11-23 06:23:20 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2014-11-23 07:01:45 -0500 |
commit | 280510f1060b4fb2f5853a92b7723e5330529338 (patch) | |
tree | 31b48d1a16ac15bb373f7d69684ea38aa1dfbba0 /arch/tile/kernel/pci_gx.c | |
parent | 23ed8d57f3b87520e045ba0e3a2340638b31198a (diff) |
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>
Diffstat (limited to 'arch/tile/kernel/pci_gx.c')
-rw-r--r-- | arch/tile/kernel/pci_gx.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/tile/kernel/pci_gx.c b/arch/tile/kernel/pci_gx.c index 376d9f1d9951..e717af20dada 100644 --- 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 = { | |||
1453 | static unsigned int tilegx_msi_startup(struct irq_data *d) | 1453 | static unsigned int tilegx_msi_startup(struct irq_data *d) |
1454 | { | 1454 | { |
1455 | if (d->msi_desc) | 1455 | if (d->msi_desc) |
1456 | unmask_msi_irq(d); | 1456 | pci_msi_unmask_irq(d); |
1457 | 1457 | ||
1458 | return 0; | 1458 | return 0; |
1459 | } | 1459 | } |
@@ -1465,14 +1465,14 @@ static void tilegx_msi_ack(struct irq_data *d) | |||
1465 | 1465 | ||
1466 | static void tilegx_msi_mask(struct irq_data *d) | 1466 | static void tilegx_msi_mask(struct irq_data *d) |
1467 | { | 1467 | { |
1468 | mask_msi_irq(d); | 1468 | pci_msi_mask_irq(d); |
1469 | __insn_mtspr(SPR_IPI_MASK_SET_K, 1UL << d->irq); | 1469 | __insn_mtspr(SPR_IPI_MASK_SET_K, 1UL << d->irq); |
1470 | } | 1470 | } |
1471 | 1471 | ||
1472 | static void tilegx_msi_unmask(struct irq_data *d) | 1472 | static void tilegx_msi_unmask(struct irq_data *d) |
1473 | { | 1473 | { |
1474 | __insn_mtspr(SPR_IPI_MASK_RESET_K, 1UL << d->irq); | 1474 | __insn_mtspr(SPR_IPI_MASK_RESET_K, 1UL << d->irq); |
1475 | unmask_msi_irq(d); | 1475 | pci_msi_unmask_irq(d); |
1476 | } | 1476 | } |
1477 | 1477 | ||
1478 | static struct irq_chip tilegx_msi_chip = { | 1478 | static struct irq_chip tilegx_msi_chip = { |