aboutsummaryrefslogtreecommitdiff
path: root/arch/sh64/kernel/pci_sh5.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2007-05-14 09:10:01 +0900
committerPaul Mundt <lethal@linux-sh.org>2007-05-14 09:10:01 +0900
commita226d33abccff1959cec911da4143ea06ab22052 (patch)
tree3dc9154f56eb328ae6257e09b02a183de46f4763 /arch/sh64/kernel/pci_sh5.c
parent6b5d1a0a2ff4fc5a26029f62eef033224ce0fa97 (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.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sh64/kernel/pci_sh5.c b/arch/sh64/kernel/pci_sh5.c
index 649b3366774..fb51660847c 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)
return result;
}
-irqreturn_t pcish5_err_irq(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t pcish5_err_irq(int irq, void *dev_id)
{
+ struct pt_regs *regs = get_irq_regs();
unsigned pci_int, pci_air, pci_cir, pci_aint;
pci_int = SH5PCI_READ(INT);
@@ -368,7 +369,7 @@ irqreturn_t pcish5_err_irq(int irq, void *dev_id, struct pt_regs *regs)
return IRQ_HANDLED;
}
-irqreturn_t pcish5_serr_irq(int irq, void *dev_id, struct pt_regs *regs)
+static irqreturn_t pcish5_serr_irq(int irq, void *dev_id)
{
printk("SERR IRQ\n");