diff options
Diffstat (limited to 'drivers/macintosh/macio-adb.c')
-rw-r--r-- | drivers/macintosh/macio-adb.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drivers/macintosh/macio-adb.c b/drivers/macintosh/macio-adb.c index 4b08852c35ee..797cef72258f 100644 --- a/drivers/macintosh/macio-adb.c +++ b/drivers/macintosh/macio-adb.c | |||
@@ -64,7 +64,7 @@ static DEFINE_SPINLOCK(macio_lock); | |||
64 | 64 | ||
65 | static int macio_probe(void); | 65 | static int macio_probe(void); |
66 | static int macio_init(void); | 66 | static int macio_init(void); |
67 | static irqreturn_t macio_adb_interrupt(int irq, void *arg, struct pt_regs *regs); | 67 | static irqreturn_t macio_adb_interrupt(int irq, void *arg); |
68 | static int macio_send_request(struct adb_request *req, int sync); | 68 | static int macio_send_request(struct adb_request *req, int sync); |
69 | static int macio_adb_autopoll(int devs); | 69 | static int macio_adb_autopoll(int devs); |
70 | static void macio_adb_poll(void); | 70 | static void macio_adb_poll(void); |
@@ -189,8 +189,7 @@ static int macio_send_request(struct adb_request *req, int sync) | |||
189 | return 0; | 189 | return 0; |
190 | } | 190 | } |
191 | 191 | ||
192 | static irqreturn_t macio_adb_interrupt(int irq, void *arg, | 192 | static irqreturn_t macio_adb_interrupt(int irq, void *arg) |
193 | struct pt_regs *regs) | ||
194 | { | 193 | { |
195 | int i, n, err; | 194 | int i, n, err; |
196 | struct adb_request *req = NULL; | 195 | struct adb_request *req = NULL; |
@@ -260,7 +259,7 @@ static irqreturn_t macio_adb_interrupt(int irq, void *arg, | |||
260 | (*done)(req); | 259 | (*done)(req); |
261 | } | 260 | } |
262 | if (ibuf_len) | 261 | if (ibuf_len) |
263 | adb_input(ibuf, ibuf_len, regs, autopoll); | 262 | adb_input(ibuf, ibuf_len, autopoll); |
264 | 263 | ||
265 | return IRQ_RETVAL(handled); | 264 | return IRQ_RETVAL(handled); |
266 | } | 265 | } |
@@ -271,6 +270,6 @@ static void macio_adb_poll(void) | |||
271 | 270 | ||
272 | local_irq_save(flags); | 271 | local_irq_save(flags); |
273 | if (in_8(&adb->intr.r) != 0) | 272 | if (in_8(&adb->intr.r) != 0) |
274 | macio_adb_interrupt(0, NULL, NULL); | 273 | macio_adb_interrupt(0, NULL); |
275 | local_irq_restore(flags); | 274 | local_irq_restore(flags); |
276 | } | 275 | } |