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

Commit 1c9db525 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

pci: Convert msi to new irq_chip functions 



Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarIngo Molnar <mingo@elte.hu>
Acked-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Russell King <linux@arm.linux.org.uk>
parent 7c5f1351

arch/arm/mach-iop13xx/msi.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -164,10 +164,10 @@ static void iop13xx_msi_nop(unsigned int irq) 
static struct irq_chip iop13xx_msi_chip = {

static struct irq_chip iop13xx_msi_chip = {

	.name = "PCI-MSI",

	.name = "PCI-MSI",

	.ack = iop13xx_msi_nop,

	.ack = iop13xx_msi_nop,

	.enable = unmask_msi_irq,

	.irq_enable = unmask_msi_irq,

	.disable = mask_msi_irq,

	.irq_disable = mask_msi_irq,

	.mask = mask_msi_irq,

	.irq_mask = mask_msi_irq,

	.unmask = unmask_msi_irq,

	.irq_unmask = unmask_msi_irq,

};

};





int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)

int arch_setup_msi_irq(struct pci_dev *pdev, struct msi_desc *desc)

arch/ia64/kernel/msi_ia64.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -104,8 +104,8 @@ static int ia64_msi_retrigger_irq(unsigned int irq) 
 */

 */

static struct irq_chip ia64_msi_chip = {

static struct irq_chip ia64_msi_chip = {

	.name		= "PCI-MSI",

	.name		= "PCI-MSI",

	.mask		= mask_msi_irq,

	.irq_mask	= mask_msi_irq,

	.unmask		= unmask_msi_irq,

	.irq_unmask	= unmask_msi_irq,

	.ack		= ia64_ack_msi_irq,

	.ack		= ia64_ack_msi_irq,

#ifdef CONFIG_SMP

#ifdef CONFIG_SMP

	.set_affinity	= ia64_set_msi_irq_affinity,

	.set_affinity	= ia64_set_msi_irq_affinity,

arch/ia64/sn/kernel/msi_sn.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -228,8 +228,8 @@ static int sn_msi_retrigger_irq(unsigned int irq) 




static struct irq_chip sn_msi_chip = {

static struct irq_chip sn_msi_chip = {

	.name		= "PCI-MSI",

	.name		= "PCI-MSI",

	.mask		= mask_msi_irq,

	.irq_mask	= mask_msi_irq,

	.unmask		= unmask_msi_irq,

	.irq_unmask	= unmask_msi_irq,

	.ack		= sn_ack_msi_irq,

	.ack		= sn_ack_msi_irq,

#ifdef CONFIG_SMP

#ifdef CONFIG_SMP

	.set_affinity	= sn_set_msi_irq_affinity,

	.set_affinity	= sn_set_msi_irq_affinity,

arch/powerpc/platforms/cell/axon_msi.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -310,9 +310,9 @@ static void axon_msi_teardown_msi_irqs(struct pci_dev *dev) 
}

}





static struct irq_chip msic_irq_chip = {

static struct irq_chip msic_irq_chip = {

	.mask		= mask_msi_irq,

	.irq_mask	= mask_msi_irq,

	.unmask		= unmask_msi_irq,

	.irq_unmask	= unmask_msi_irq,

	.shutdown	= unmask_msi_irq,

	.irq_shutdown	= mask_msi_irq,

	.name		= "AXON-MSI",

	.name		= "AXON-MSI",

};

};

arch/powerpc/platforms/pseries/xics.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -243,7 +243,7 @@ static unsigned int xics_startup(unsigned int virq) 
	 * at that level, so we do it here by hand.

	 * at that level, so we do it here by hand.

	 */

	 */

	if (irq_to_desc(virq)->msi_desc)

	if (irq_to_desc(virq)->msi_desc)

		unmask_msi_irq(virq);

		unmask_msi_irq(irq_get_irq_data(virq));





	/* unmask it */

	/* unmask it */

	xics_unmask_irq(virq);

	xics_unmask_irq(virq);