[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>

authored by Al Viro and committed by Linus Torvalds a5d361fc 031eb4cd

+16 -16
+2 -2
arch/m68k/mac/iop.c
··· 293 } 294 295 for (i = 0 ; i < NUM_IOP_CHAN ; i++) { 296 - iop_send_queue[IOP_NUM_SCC][i] = 0; 297 - iop_send_queue[IOP_NUM_ISM][i] = 0; 298 iop_listeners[IOP_NUM_SCC][i].devname = NULL; 299 iop_listeners[IOP_NUM_SCC][i].handler = NULL; 300 iop_listeners[IOP_NUM_ISM][i].devname = NULL;
··· 293 } 294 295 for (i = 0 ; i < NUM_IOP_CHAN ; i++) { 296 + iop_send_queue[IOP_NUM_SCC][i] = NULL; 297 + iop_send_queue[IOP_NUM_ISM][i] = NULL; 298 iop_listeners[IOP_NUM_SCC][i].devname = NULL; 299 iop_listeners[IOP_NUM_SCC][i].handler = NULL; 300 iop_listeners[IOP_NUM_ISM][i].devname = NULL;
+1 -1
drivers/macintosh/adb-iop.c
··· 239 240 local_irq_save(flags); 241 242 - req->next = 0; 243 req->sent = 0; 244 req->complete = 0; 245 req->reply_len = 0;
··· 239 240 local_irq_save(flags); 241 242 + req->next = NULL; 243 req->sent = 0; 244 req->complete = 0; 245 req->reply_len = 0;
+2 -2
drivers/macintosh/via-macii.c
··· 260 return -EINVAL; 261 } 262 263 - req->next = 0; 264 req->sent = 0; 265 req->complete = 0; 266 req->reply_len = 0; ··· 295 unsigned long flags; 296 297 local_irq_save(flags); 298 - if (via[IFR] & SR_INT) macii_interrupt(0, 0, 0); 299 local_irq_restore(flags); 300 } 301
··· 260 return -EINVAL; 261 } 262 263 + req->next = NULL; 264 req->sent = 0; 265 req->complete = 0; 266 req->reply_len = 0; ··· 295 unsigned long flags; 296 297 local_irq_save(flags); 298 + if (via[IFR] & SR_INT) macii_interrupt(0, NULL, NULL); 299 local_irq_restore(flags); 300 } 301
+2 -2
drivers/macintosh/via-maciisi.c
··· 326 req->complete = 1; 327 return -EINVAL; 328 } 329 - req->next = 0; 330 req->sent = 0; 331 req->complete = 0; 332 req->reply_len = 0; ··· 421 422 local_irq_save(flags); 423 if (via[IFR] & SR_INT) { 424 - maciisi_interrupt(0, 0, 0); 425 } 426 else /* avoid calling this function too quickly in a loop */ 427 udelay(ADB_DELAY);
··· 326 req->complete = 1; 327 return -EINVAL; 328 } 329 + req->next = NULL; 330 req->sent = 0; 331 req->complete = 0; 332 req->reply_len = 0; ··· 421 422 local_irq_save(flags); 423 if (via[IFR] & SR_INT) { 424 + maciisi_interrupt(0, NULL, NULL); 425 } 426 else /* avoid calling this function too quickly in a loop */ 427 udelay(ADB_DELAY);
+2 -2
drivers/macintosh/via-pmu68k.c
··· 493 return -EINVAL; 494 } 495 496 - req->next = 0; 497 req->sent = 0; 498 req->complete = 0; 499 local_irq_save(flags); ··· 717 printk(KERN_ERR "PMU: extra ADB reply\n"); 718 return; 719 } 720 - req_awaiting_reply = 0; 721 if (len <= 2) 722 req->reply_len = 0; 723 else {
··· 493 return -EINVAL; 494 } 495 496 + req->next = NULL; 497 req->sent = 0; 498 req->complete = 0; 499 local_irq_save(flags); ··· 717 printk(KERN_ERR "PMU: extra ADB reply\n"); 718 return; 719 } 720 + req_awaiting_reply = NULL; 721 if (len <= 2) 722 req->reply_len = 0; 723 else {
+1 -1
drivers/net/hplance.c
··· 150 lp->lance.name = (char*)d->name; /* discards const, shut up gcc */ 151 lp->lance.base = va; 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 */ 154 lp->lance.busmaster_regval = LE_C3_BSWP; /* we're bigendian */ 155 lp->lance.irq = d->ipl; 156 lp->lance.writerap = hplance_writerap;
··· 150 lp->lance.name = (char*)d->name; /* discards const, shut up gcc */ 151 lp->lance.base = va; 152 lp->lance.init_block = (struct lance_init_block *)(va + HPLANCE_MEMOFF); /* CPU addr */ 153 + lp->lance.lance_init_block = NULL; /* LANCE addr of same RAM */ 154 lp->lance.busmaster_regval = LE_C3_BSWP; /* we're bigendian */ 155 lp->lance.irq = d->ipl; 156 lp->lance.writerap = hplance_writerap;
+1 -1
drivers/net/sun3lance.c
··· 389 dev->stop = &lance_close; 390 dev->get_stats = &lance_get_stats; 391 dev->set_multicast_list = &set_multicast_list; 392 - dev->set_mac_address = 0; 393 // KLUDGE -- REMOVE ME 394 set_bit(__LINK_STATE_PRESENT, &dev->state); 395
··· 389 dev->stop = &lance_close; 390 dev->get_stats = &lance_get_stats; 391 dev->set_multicast_list = &set_multicast_list; 392 + dev->set_mac_address = NULL; 393 // KLUDGE -- REMOVE ME 394 set_bit(__LINK_STATE_PRESENT, &dev->state); 395
+2 -2
drivers/scsi/wd33c93.c
··· 465 */ 466 467 cmd = (struct scsi_cmnd *) hostdata->input_Q; 468 - prev = 0; 469 while (cmd) { 470 if (!(hostdata->busy[cmd->device->id] & (1 << cmd->device->lun))) 471 break; ··· 1569 */ 1570 1571 tmp = (struct scsi_cmnd *) hostdata->input_Q; 1572 - prev = 0; 1573 while (tmp) { 1574 if (tmp == cmd) { 1575 if (prev)
··· 465 */ 466 467 cmd = (struct scsi_cmnd *) hostdata->input_Q; 468 + prev = NULL; 469 while (cmd) { 470 if (!(hostdata->busy[cmd->device->id] & (1 << cmd->device->lun))) 471 break; ··· 1569 */ 1570 1571 tmp = (struct scsi_cmnd *) hostdata->input_Q; 1572 + prev = NULL; 1573 while (tmp) { 1574 if (tmp == cmd) { 1575 if (prev)
+1 -1
include/asm-m68k/floppy.h
··· 46 47 static int virtual_dma_count=0; 48 static int virtual_dma_residue=0; 49 - static char *virtual_dma_addr=0; 50 static int virtual_dma_mode=0; 51 static int doing_pdma=0; 52
··· 46 47 static int virtual_dma_count=0; 48 static int virtual_dma_residue=0; 49 + static char *virtual_dma_addr=NULL; 50 static int virtual_dma_mode=0; 51 static int doing_pdma=0; 52
+2 -2
include/asm-m68k/sun3xflop.h
··· 208 209 if(!once) { 210 once = 1; 211 - error = request_irq(FLOPPY_IRQ, sun3xflop_hardint, SA_INTERRUPT, "floppy", 0); 212 return ((error == 0) ? 0 : -1); 213 } else return 0; 214 } ··· 238 *sun3x_fdc.fcr_r = 0; 239 240 /* Success... */ 241 - floppy_set_flags(0, 1, FD_BROKEN_DCL); // I don't know how to detect this. 242 allowed_drive_mask = 0x01; 243 return (int) SUN3X_FDC; 244 }
··· 208 209 if(!once) { 210 once = 1; 211 + error = request_irq(FLOPPY_IRQ, sun3xflop_hardint, SA_INTERRUPT, "floppy", NULL); 212 return ((error == 0) ? 0 : -1); 213 } else return 0; 214 } ··· 238 *sun3x_fdc.fcr_r = 0; 239 240 /* Success... */ 241 + floppy_set_flags(NULL, 1, FD_BROKEN_DCL); // I don't know how to detect this. 242 allowed_drive_mask = 0x01; 243 return (int) SUN3X_FDC; 244 }