Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 280510f1 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

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: default avatarThomas 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>
parent 23ed8d57

arch/arm/mach-iop13xx/msi.c

+4 −4
Original line number Diff line number Diff line
@@ -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)

arch/ia64/kernel/msi_ia64.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

arch/ia64/sn/kernel/msi_sn.c

+2 −2
Original line number Diff line number Diff line
@@ -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,

arch/mips/pci/msi-xlp.c

+4 −4
Original line number Diff line number Diff line
@@ -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)

arch/powerpc/platforms/cell/axon_msi.c

+3 −3
Original line number Diff line number Diff line
@@ -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",

};