aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/macintosh
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/macintosh')
-rw-r--r--drivers/macintosh/adb-iop.c2
-rw-r--r--drivers/macintosh/via-macii.c4
-rw-r--r--drivers/macintosh/via-maciisi.c4
-rw-r--r--drivers/macintosh/via-pmu68k.c4
4 files changed, 7 insertions, 7 deletions
diff --git a/drivers/macintosh/adb-iop.c b/drivers/macintosh/adb-iop.c
index 71aeb912ec61..d56d400b6aaa 100644
--- a/drivers/macintosh/adb-iop.c
+++ b/drivers/macintosh/adb-iop.c
@@ -239,7 +239,7 @@ static int adb_iop_write(struct adb_request *req)
239 239
240 local_irq_save(flags); 240 local_irq_save(flags);
241 241
242 req->next = 0; 242 req->next = NULL;
243 req->sent = 0; 243 req->sent = 0;
244 req->complete = 0; 244 req->complete = 0;
245 req->reply_len = 0; 245 req->reply_len = 0;
diff --git a/drivers/macintosh/via-macii.c b/drivers/macintosh/via-macii.c
index e9a159ad3022..2a2ffe060169 100644
--- a/drivers/macintosh/via-macii.c
+++ b/drivers/macintosh/via-macii.c
@@ -260,7 +260,7 @@ static int macii_write(struct adb_request *req)
260 return -EINVAL; 260 return -EINVAL;
261 } 261 }
262 262
263 req->next = 0; 263 req->next = NULL;
264 req->sent = 0; 264 req->sent = 0;
265 req->complete = 0; 265 req->complete = 0;
266 req->reply_len = 0; 266 req->reply_len = 0;
@@ -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, 0, 0); 298 if (via[IFR] & SR_INT) macii_interrupt(0, NULL, NULL);
299 local_irq_restore(flags); 299 local_irq_restore(flags);
300} 300}
301 301
diff --git a/drivers/macintosh/via-maciisi.c b/drivers/macintosh/via-maciisi.c
index ad271e705a31..0129fcc3b183 100644
--- a/drivers/macintosh/via-maciisi.c
+++ b/drivers/macintosh/via-maciisi.c
@@ -326,7 +326,7 @@ maciisi_write(struct adb_request* req)
326 req->complete = 1; 326 req->complete = 1;
327 return -EINVAL; 327 return -EINVAL;
328 } 328 }
329 req->next = 0; 329 req->next = NULL;
330 req->sent = 0; 330 req->sent = 0;
331 req->complete = 0; 331 req->complete = 0;
332 req->reply_len = 0; 332 req->reply_len = 0;
@@ -421,7 +421,7 @@ maciisi_poll(void)
421 421
422 local_irq_save(flags); 422 local_irq_save(flags);
423 if (via[IFR] & SR_INT) { 423 if (via[IFR] & SR_INT) {
424 maciisi_interrupt(0, 0, 0); 424 maciisi_interrupt(0, NULL, NULL);
425 } 425 }
426 else /* avoid calling this function too quickly in a loop */ 426 else /* avoid calling this function too quickly in a loop */
427 udelay(ADB_DELAY); 427 udelay(ADB_DELAY);
diff --git a/drivers/macintosh/via-pmu68k.c b/drivers/macintosh/via-pmu68k.c
index 6f80d76ac17c..f08e52f2107b 100644
--- a/drivers/macintosh/via-pmu68k.c
+++ b/drivers/macintosh/via-pmu68k.c
@@ -493,7 +493,7 @@ pmu_queue_request(struct adb_request *req)
493 return -EINVAL; 493 return -EINVAL;
494 } 494 }
495 495
496 req->next = 0; 496 req->next = NULL;
497 req->sent = 0; 497 req->sent = 0;
498 req->complete = 0; 498 req->complete = 0;
499 local_irq_save(flags); 499 local_irq_save(flags);
@@ -717,7 +717,7 @@ pmu_handle_data(unsigned char *data, int len, struct pt_regs *regs)
717 printk(KERN_ERR "PMU: extra ADB reply\n"); 717 printk(KERN_ERR "PMU: extra ADB reply\n");
718 return; 718 return;
719 } 719 }
720 req_awaiting_reply = 0; 720 req_awaiting_reply = NULL;
721 if (len <= 2) 721 if (len <= 2)
722 req->reply_len = 0; 722 req->reply_len = 0;
723 else { 723 else {