diff options
author | Paul Mundt <lethal@linux-sh.org> | 2007-05-13 20:10:01 -0400 |
---|---|---|
committer | Paul Mundt <lethal@linux-sh.org> | 2007-05-13 20:10:01 -0400 |
commit | a226d33abccff1959cec911da4143ea06ab22052 (patch) | |
tree | 3dc9154f56eb328ae6257e09b02a183de46f4763 /arch/sh64/kernel/pci_sh5.c | |
parent | 6b5d1a0a2ff4fc5a26029f62eef033224ce0fa97 (diff) |
sh64: Fixups for the irq_regs changes.
A few interrupt handlers were never updated, fix them up.
We were missing the irq_regs conversion also, so do that
at the same time.
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh64/kernel/pci_sh5.c')
-rw-r--r-- | arch/sh64/kernel/pci_sh5.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sh64/kernel/pci_sh5.c b/arch/sh64/kernel/pci_sh5.c index 649b33667748..fb51660847c8 100644 --- a/arch/sh64/kernel/pci_sh5.c +++ b/arch/sh64/kernel/pci_sh5.c | |||
@@ -340,8 +340,9 @@ static int __init map_cayman_irq(struct pci_dev *dev, u8 slot, u8 pin) | |||
340 | return result; | 340 | return result; |
341 | } | 341 | } |
342 | 342 | ||
343 | irqreturn_t pcish5_err_irq(int irq, void *dev_id, struct pt_regs *regs) | 343 | static irqreturn_t pcish5_err_irq(int irq, void *dev_id) |
344 | { | 344 | { |
345 | struct pt_regs *regs = get_irq_regs(); | ||
345 | unsigned pci_int, pci_air, pci_cir, pci_aint; | 346 | unsigned pci_int, pci_air, pci_cir, pci_aint; |
346 | 347 | ||
347 | pci_int = SH5PCI_READ(INT); | 348 | pci_int = SH5PCI_READ(INT); |
@@ -368,7 +369,7 @@ irqreturn_t pcish5_err_irq(int irq, void *dev_id, struct pt_regs *regs) | |||
368 | return IRQ_HANDLED; | 369 | return IRQ_HANDLED; |
369 | } | 370 | } |
370 | 371 | ||
371 | irqreturn_t pcish5_serr_irq(int irq, void *dev_id, struct pt_regs *regs) | 372 | static irqreturn_t pcish5_serr_irq(int irq, void *dev_id) |
372 | { | 373 | { |
373 | printk("SERR IRQ\n"); | 374 | printk("SERR IRQ\n"); |
374 | 375 | ||