diff options
Diffstat (limited to 'arch/arm/mach-pxa/mainstone.c')
-rw-r--r-- | arch/arm/mach-pxa/mainstone.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/arm/mach-pxa/mainstone.c b/arch/arm/mach-pxa/mainstone.c index 7ba0447d6fa3..49c34d94a9fe 100644 --- a/arch/arm/mach-pxa/mainstone.c +++ b/arch/arm/mach-pxa/mainstone.c | |||
@@ -71,8 +71,7 @@ static struct irq_chip mainstone_irq_chip = { | |||
71 | .unmask = mainstone_unmask_irq, | 71 | .unmask = mainstone_unmask_irq, |
72 | }; | 72 | }; |
73 | 73 | ||
74 | static void mainstone_irq_handler(unsigned int irq, struct irqdesc *desc, | 74 | static void mainstone_irq_handler(unsigned int irq, struct irqdesc *desc) |
75 | struct pt_regs *regs) | ||
76 | { | 75 | { |
77 | unsigned long pending = MST_INTSETCLR & mainstone_irq_enabled; | 76 | unsigned long pending = MST_INTSETCLR & mainstone_irq_enabled; |
78 | do { | 77 | do { |
@@ -80,7 +79,7 @@ static void mainstone_irq_handler(unsigned int irq, struct irqdesc *desc, | |||
80 | if (likely(pending)) { | 79 | if (likely(pending)) { |
81 | irq = MAINSTONE_IRQ(0) + __ffs(pending); | 80 | irq = MAINSTONE_IRQ(0) + __ffs(pending); |
82 | desc = irq_desc + irq; | 81 | desc = irq_desc + irq; |
83 | desc_handle_irq(irq, desc, regs); | 82 | desc_handle_irq(irq, desc); |
84 | } | 83 | } |
85 | pending = MST_INTSETCLR & mainstone_irq_enabled; | 84 | pending = MST_INTSETCLR & mainstone_irq_enabled; |
86 | } while (pending); | 85 | } while (pending); |
@@ -314,7 +313,7 @@ static struct pxafb_mach_info mainstone_pxafb_info = { | |||
314 | .pxafb_backlight_power = mainstone_backlight_power, | 313 | .pxafb_backlight_power = mainstone_backlight_power, |
315 | }; | 314 | }; |
316 | 315 | ||
317 | static int mainstone_mci_init(struct device *dev, irqreturn_t (*mstone_detect_int)(int, void *, struct pt_regs *), void *data) | 316 | static int mainstone_mci_init(struct device *dev, irq_handler_t mstone_detect_int, void *data) |
318 | { | 317 | { |
319 | int err; | 318 | int err; |
320 | 319 | ||