diff options
| author | Thomas Gleixner <[email protected]> | 2010-09-28 14:46:51 +0000 |
|---|---|---|
| committer | Thomas Gleixner <[email protected]> | 2010-10-12 14:53:34 +0000 |
| commit | 1c9db52534a2c0e9776788cd34ccc193289fc18c (patch) | |
| tree | 5cca6ab7d72bee784c425879a5f17b4c6fe1c5d8 /arch/powerpc/sysdev/mpic_u3msi.c | |
| parent | Merge branch 'x86/urgent' of into irq/sparseirq (diff) | |
| download | kernel-1c9db52534a2c0e9776788cd34ccc193289fc18c.tar.gz kernel-1c9db52534a2c0e9776788cd34ccc193289fc18c.zip | |
pci: Convert msi to new irq_chip functions
Signed-off-by: Thomas Gleixner <[email protected]>
Reviewed-by: Ingo Molnar <[email protected]>
Acked-by: Jesse Barnes <[email protected]>
Cc: Benjamin Herrenschmidt <[email protected]>
Cc: "David S. Miller" <[email protected]>
Cc: Tony Luck <[email protected]>
Cc: Russell King <[email protected]>
Diffstat (limited to 'arch/powerpc/sysdev/mpic_u3msi.c')
| -rw-r--r-- | arch/powerpc/sysdev/mpic_u3msi.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/arch/powerpc/sysdev/mpic_u3msi.c b/arch/powerpc/sysdev/mpic_u3msi.c index bcbfe79c704b..a2b028b4a202 100644 --- a/arch/powerpc/sysdev/mpic_u3msi.c +++ b/arch/powerpc/sysdev/mpic_u3msi.c @@ -23,22 +23,22 @@ /* A bit ugly, can we get this from the pci_dev somehow? */ static struct mpic *msi_mpic; -static void mpic_u3msi_mask_irq(unsigned int irq) +static void mpic_u3msi_mask_irq(struct irq_data *data) { - mask_msi_irq(irq); - mpic_mask_irq(irq); + mask_msi_irq(data); + mpic_mask_irq(data->irq); } -static void mpic_u3msi_unmask_irq(unsigned int irq) +static void mpic_u3msi_unmask_irq(struct irq_data *data) { - mpic_unmask_irq(irq); - unmask_msi_irq(irq); + mpic_unmask_irq(data->irq); + unmask_msi_irq(data); } static struct irq_chip mpic_u3msi_chip = { - .shutdown = mpic_u3msi_mask_irq, - .mask = mpic_u3msi_mask_irq, - .unmask = mpic_u3msi_unmask_irq, + .irq_shutdown = mpic_u3msi_mask_irq, + .irq_mask = mpic_u3msi_mask_irq, + .irq_unmask = mpic_u3msi_unmask_irq, .eoi = mpic_end_irq, .set_type = mpic_set_irq_type, .set_affinity = mpic_set_affinity, |