diff options
Diffstat (limited to 'drivers/macintosh/via-macii.c')
-rw-r--r-- | drivers/macintosh/via-macii.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/macintosh/via-macii.c b/drivers/macintosh/via-macii.c index 2a2ffe060169..5d88d5b0ad99 100644 --- a/drivers/macintosh/via-macii.c +++ b/drivers/macintosh/via-macii.c | |||
@@ -77,7 +77,7 @@ static volatile unsigned char *via; | |||
77 | 77 | ||
78 | static int macii_init_via(void); | 78 | static int macii_init_via(void); |
79 | static void macii_start(void); | 79 | static void macii_start(void); |
80 | static irqreturn_t macii_interrupt(int irq, void *arg, struct pt_regs *regs); | 80 | static irqreturn_t macii_interrupt(int irq, void *arg); |
81 | static void macii_retransmit(int); | 81 | static void macii_retransmit(int); |
82 | static void macii_queue_poll(void); | 82 | static void macii_queue_poll(void); |
83 | 83 | ||
@@ -295,7 +295,7 @@ static void macii_poll(void) | |||
295 | unsigned long flags; | 295 | unsigned long flags; |
296 | 296 | ||
297 | local_irq_save(flags); | 297 | local_irq_save(flags); |
298 | if (via[IFR] & SR_INT) macii_interrupt(0, NULL, NULL); | 298 | if (via[IFR] & SR_INT) macii_interrupt(0, NULL); |
299 | local_irq_restore(flags); | 299 | local_irq_restore(flags); |
300 | } | 300 | } |
301 | 301 | ||
@@ -410,7 +410,7 @@ static void macii_start(void) | |||
410 | * Note: As of 21/10/97, the MacII ADB part works including timeout detection | 410 | * Note: As of 21/10/97, the MacII ADB part works including timeout detection |
411 | * and retransmit (Talk to the last active device). | 411 | * and retransmit (Talk to the last active device). |
412 | */ | 412 | */ |
413 | static irqreturn_t macii_interrupt(int irq, void *arg, struct pt_regs *regs) | 413 | static irqreturn_t macii_interrupt(int irq, void *arg) |
414 | { | 414 | { |
415 | int x, adbdir; | 415 | int x, adbdir; |
416 | unsigned long flags; | 416 | unsigned long flags; |
@@ -602,8 +602,7 @@ static irqreturn_t macii_interrupt(int irq, void *arg, struct pt_regs *regs) | |||
602 | current_req = req->next; | 602 | current_req = req->next; |
603 | if (req->done) (*req->done)(req); | 603 | if (req->done) (*req->done)(req); |
604 | } else { | 604 | } else { |
605 | adb_input(reply_buf, reply_ptr - reply_buf, | 605 | adb_input(reply_buf, reply_ptr - reply_buf, 0); |
606 | regs, 0); | ||
607 | } | 606 | } |
608 | 607 | ||
609 | /* | 608 | /* |