diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2006-01-12 04:06:34 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-12 12:09:04 -0500 |
commit | a5d361fc24b75ea51e219367ee32c64422a2134f (patch) | |
tree | a81fe8cae7e440b97fe9114ee10af7b9ff5625da | |
parent | 031eb4cddec7a4825212ece47de4bd64cd8e0bee (diff) |
[PATCH] m68k: NULL noise removal
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | arch/m68k/mac/iop.c | 4 | ||||
-rw-r--r-- | drivers/macintosh/adb-iop.c | 2 | ||||
-rw-r--r-- | drivers/macintosh/via-macii.c | 4 | ||||
-rw-r--r-- | drivers/macintosh/via-maciisi.c | 4 | ||||
-rw-r--r-- | drivers/macintosh/via-pmu68k.c | 4 | ||||
-rw-r--r-- | drivers/net/hplance.c | 2 | ||||
-rw-r--r-- | drivers/net/sun3lance.c | 2 | ||||
-rw-r--r-- | drivers/scsi/wd33c93.c | 4 | ||||
-rw-r--r-- | include/asm-m68k/floppy.h | 2 | ||||
-rw-r--r-- | include/asm-m68k/sun3xflop.h | 4 |
10 files changed, 16 insertions, 16 deletions
diff --git a/arch/m68k/mac/iop.c b/arch/m68k/mac/iop.c index d889ba80ccdc..9179a3798407 100644 --- a/arch/m68k/mac/iop.c +++ b/arch/m68k/mac/iop.c | |||
@@ -293,8 +293,8 @@ void __init iop_init(void) | |||
293 | } | 293 | } |
294 | 294 | ||
295 | for (i = 0 ; i < NUM_IOP_CHAN ; i++) { | 295 | for (i = 0 ; i < NUM_IOP_CHAN ; i++) { |
296 | iop_send_queue[IOP_NUM_SCC][i] = 0; | 296 | iop_send_queue[IOP_NUM_SCC][i] = NULL; |
297 | iop_send_queue[IOP_NUM_ISM][i] = 0; | 297 | iop_send_queue[IOP_NUM_ISM][i] = NULL; |
298 | iop_listeners[IOP_NUM_SCC][i].devname = NULL; | 298 | iop_listeners[IOP_NUM_SCC][i].devname = NULL; |
299 | iop_listeners[IOP_NUM_SCC][i].handler = NULL; | 299 | iop_listeners[IOP_NUM_SCC][i].handler = NULL; |
300 | iop_listeners[IOP_NUM_ISM][i].devname = NULL; | 300 | iop_listeners[IOP_NUM_ISM][i].devname = NULL; |
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 { |
diff --git a/drivers/net/hplance.c b/drivers/net/hplance.c index 08703d6f934c..d8410634bcaf 100644 --- a/drivers/net/hplance.c +++ b/drivers/net/hplance.c | |||
@@ -150,7 +150,7 @@ static void __init hplance_init(struct net_device *dev, struct dio_dev *d) | |||
150 | lp->lance.name = (char*)d->name; /* discards const, shut up gcc */ | 150 | lp->lance.name = (char*)d->name; /* discards const, shut up gcc */ |
151 | lp->lance.base = va; | 151 | lp->lance.base = va; |
152 | lp->lance.init_block = (struct lance_init_block *)(va + HPLANCE_MEMOFF); /* CPU addr */ | 152 | lp->lance.init_block = (struct lance_init_block *)(va + HPLANCE_MEMOFF); /* CPU addr */ |
153 | lp->lance.lance_init_block = 0; /* LANCE addr of same RAM */ | 153 | lp->lance.lance_init_block = NULL; /* LANCE addr of same RAM */ |
154 | lp->lance.busmaster_regval = LE_C3_BSWP; /* we're bigendian */ | 154 | lp->lance.busmaster_regval = LE_C3_BSWP; /* we're bigendian */ |
155 | lp->lance.irq = d->ipl; | 155 | lp->lance.irq = d->ipl; |
156 | lp->lance.writerap = hplance_writerap; | 156 | lp->lance.writerap = hplance_writerap; |
diff --git a/drivers/net/sun3lance.c b/drivers/net/sun3lance.c index 5c8fcd40ef4d..01bdb2334058 100644 --- a/drivers/net/sun3lance.c +++ b/drivers/net/sun3lance.c | |||
@@ -389,7 +389,7 @@ static int __init lance_probe( struct net_device *dev) | |||
389 | dev->stop = &lance_close; | 389 | dev->stop = &lance_close; |
390 | dev->get_stats = &lance_get_stats; | 390 | dev->get_stats = &lance_get_stats; |
391 | dev->set_multicast_list = &set_multicast_list; | 391 | dev->set_multicast_list = &set_multicast_list; |
392 | dev->set_mac_address = 0; | 392 | dev->set_mac_address = NULL; |
393 | // KLUDGE -- REMOVE ME | 393 | // KLUDGE -- REMOVE ME |
394 | set_bit(__LINK_STATE_PRESENT, &dev->state); | 394 | set_bit(__LINK_STATE_PRESENT, &dev->state); |
395 | 395 | ||
diff --git a/drivers/scsi/wd33c93.c b/drivers/scsi/wd33c93.c index fd63add6a577..fb53eeaee617 100644 --- a/drivers/scsi/wd33c93.c +++ b/drivers/scsi/wd33c93.c | |||
@@ -465,7 +465,7 @@ wd33c93_execute(struct Scsi_Host *instance) | |||
465 | */ | 465 | */ |
466 | 466 | ||
467 | cmd = (struct scsi_cmnd *) hostdata->input_Q; | 467 | cmd = (struct scsi_cmnd *) hostdata->input_Q; |
468 | prev = 0; | 468 | prev = NULL; |
469 | while (cmd) { | 469 | while (cmd) { |
470 | if (!(hostdata->busy[cmd->device->id] & (1 << cmd->device->lun))) | 470 | if (!(hostdata->busy[cmd->device->id] & (1 << cmd->device->lun))) |
471 | break; | 471 | break; |
@@ -1569,7 +1569,7 @@ wd33c93_abort(struct scsi_cmnd * cmd) | |||
1569 | */ | 1569 | */ |
1570 | 1570 | ||
1571 | tmp = (struct scsi_cmnd *) hostdata->input_Q; | 1571 | tmp = (struct scsi_cmnd *) hostdata->input_Q; |
1572 | prev = 0; | 1572 | prev = NULL; |
1573 | while (tmp) { | 1573 | while (tmp) { |
1574 | if (tmp == cmd) { | 1574 | if (tmp == cmd) { |
1575 | if (prev) | 1575 | if (prev) |
diff --git a/include/asm-m68k/floppy.h b/include/asm-m68k/floppy.h index c6e708dd9f62..63a05ed95c17 100644 --- a/include/asm-m68k/floppy.h +++ b/include/asm-m68k/floppy.h | |||
@@ -46,7 +46,7 @@ asmlinkage irqreturn_t floppy_hardint(int irq, void *dev_id, | |||
46 | 46 | ||
47 | static int virtual_dma_count=0; | 47 | static int virtual_dma_count=0; |
48 | static int virtual_dma_residue=0; | 48 | static int virtual_dma_residue=0; |
49 | static char *virtual_dma_addr=0; | 49 | static char *virtual_dma_addr=NULL; |
50 | static int virtual_dma_mode=0; | 50 | static int virtual_dma_mode=0; |
51 | static int doing_pdma=0; | 51 | static int doing_pdma=0; |
52 | 52 | ||
diff --git a/include/asm-m68k/sun3xflop.h b/include/asm-m68k/sun3xflop.h index fda1eccf10aa..98a9f79dab29 100644 --- a/include/asm-m68k/sun3xflop.h +++ b/include/asm-m68k/sun3xflop.h | |||
@@ -208,7 +208,7 @@ static int sun3xflop_request_irq(void) | |||
208 | 208 | ||
209 | if(!once) { | 209 | if(!once) { |
210 | once = 1; | 210 | once = 1; |
211 | error = request_irq(FLOPPY_IRQ, sun3xflop_hardint, SA_INTERRUPT, "floppy", 0); | 211 | error = request_irq(FLOPPY_IRQ, sun3xflop_hardint, SA_INTERRUPT, "floppy", NULL); |
212 | return ((error == 0) ? 0 : -1); | 212 | return ((error == 0) ? 0 : -1); |
213 | } else return 0; | 213 | } else return 0; |
214 | } | 214 | } |
@@ -238,7 +238,7 @@ static int sun3xflop_init(void) | |||
238 | *sun3x_fdc.fcr_r = 0; | 238 | *sun3x_fdc.fcr_r = 0; |
239 | 239 | ||
240 | /* Success... */ | 240 | /* Success... */ |
241 | floppy_set_flags(0, 1, FD_BROKEN_DCL); // I don't know how to detect this. | 241 | floppy_set_flags(NULL, 1, FD_BROKEN_DCL); // I don't know how to detect this. |
242 | allowed_drive_mask = 0x01; | 242 | allowed_drive_mask = 0x01; |
243 | return (int) SUN3X_FDC; | 243 | return (int) SUN3X_FDC; |
244 | } | 244 | } |