From: Al Viro Signed-off-by: Al Viro Cc: Roman Zippel Signed-off-by: Andrew Morton --- arch/m68k/mac/iop.c | 4 ++-- drivers/macintosh/adb-iop.c | 2 +- drivers/macintosh/via-macii.c | 4 ++-- drivers/macintosh/via-maciisi.c | 4 ++-- drivers/macintosh/via-pmu68k.c | 4 ++-- drivers/net/hplance.c | 2 +- drivers/net/sun3lance.c | 2 +- drivers/scsi/wd33c93.c | 4 ++-- include/asm-m68k/floppy.h | 2 +- include/asm-m68k/sun3xflop.h | 4 ++-- 10 files changed, 16 insertions(+), 16 deletions(-) diff -puN arch/m68k/mac/iop.c~m68k-null-noise-removal arch/m68k/mac/iop.c --- devel/arch/m68k/mac/iop.c~m68k-null-noise-removal 2006-01-04 22:24:47.000000000 -0800 +++ devel-akpm/arch/m68k/mac/iop.c 2006-01-04 22:24:47.000000000 -0800 @@ -293,8 +293,8 @@ void __init iop_init(void) } for (i = 0 ; i < NUM_IOP_CHAN ; i++) { - iop_send_queue[IOP_NUM_SCC][i] = 0; - iop_send_queue[IOP_NUM_ISM][i] = 0; + iop_send_queue[IOP_NUM_SCC][i] = NULL; + iop_send_queue[IOP_NUM_ISM][i] = NULL; iop_listeners[IOP_NUM_SCC][i].devname = NULL; iop_listeners[IOP_NUM_SCC][i].handler = NULL; iop_listeners[IOP_NUM_ISM][i].devname = NULL; diff -puN drivers/macintosh/adb-iop.c~m68k-null-noise-removal drivers/macintosh/adb-iop.c --- devel/drivers/macintosh/adb-iop.c~m68k-null-noise-removal 2006-01-04 22:24:47.000000000 -0800 +++ devel-akpm/drivers/macintosh/adb-iop.c 2006-01-04 22:24:47.000000000 -0800 @@ -239,7 +239,7 @@ static int adb_iop_write(struct adb_requ local_irq_save(flags); - req->next = 0; + req->next = NULL; req->sent = 0; req->complete = 0; req->reply_len = 0; diff -puN drivers/macintosh/via-macii.c~m68k-null-noise-removal drivers/macintosh/via-macii.c --- devel/drivers/macintosh/via-macii.c~m68k-null-noise-removal 2006-01-04 22:24:47.000000000 -0800 +++ devel-akpm/drivers/macintosh/via-macii.c 2006-01-04 22:24:47.000000000 -0800 @@ -260,7 +260,7 @@ static int macii_write(struct adb_reques return -EINVAL; } - req->next = 0; + req->next = NULL; req->sent = 0; req->complete = 0; req->reply_len = 0; @@ -295,7 +295,7 @@ static void macii_poll(void) unsigned long flags; local_irq_save(flags); - if (via[IFR] & SR_INT) macii_interrupt(0, 0, 0); + if (via[IFR] & SR_INT) macii_interrupt(0, NULL, NULL); local_irq_restore(flags); } diff -puN drivers/macintosh/via-maciisi.c~m68k-null-noise-removal drivers/macintosh/via-maciisi.c --- devel/drivers/macintosh/via-maciisi.c~m68k-null-noise-removal 2006-01-04 22:24:47.000000000 -0800 +++ devel-akpm/drivers/macintosh/via-maciisi.c 2006-01-04 22:24:47.000000000 -0800 @@ -326,7 +326,7 @@ maciisi_write(struct adb_request* req) req->complete = 1; return -EINVAL; } - req->next = 0; + req->next = NULL; req->sent = 0; req->complete = 0; req->reply_len = 0; @@ -421,7 +421,7 @@ maciisi_poll(void) local_irq_save(flags); if (via[IFR] & SR_INT) { - maciisi_interrupt(0, 0, 0); + maciisi_interrupt(0, NULL, NULL); } else /* avoid calling this function too quickly in a loop */ udelay(ADB_DELAY); diff -puN drivers/macintosh/via-pmu68k.c~m68k-null-noise-removal drivers/macintosh/via-pmu68k.c --- devel/drivers/macintosh/via-pmu68k.c~m68k-null-noise-removal 2006-01-04 22:24:47.000000000 -0800 +++ devel-akpm/drivers/macintosh/via-pmu68k.c 2006-01-04 22:24:47.000000000 -0800 @@ -493,7 +493,7 @@ pmu_queue_request(struct adb_request *re return -EINVAL; } - req->next = 0; + req->next = NULL; req->sent = 0; req->complete = 0; local_irq_save(flags); @@ -717,7 +717,7 @@ pmu_handle_data(unsigned char *data, int printk(KERN_ERR "PMU: extra ADB reply\n"); return; } - req_awaiting_reply = 0; + req_awaiting_reply = NULL; if (len <= 2) req->reply_len = 0; else { diff -puN drivers/net/hplance.c~m68k-null-noise-removal drivers/net/hplance.c --- devel/drivers/net/hplance.c~m68k-null-noise-removal 2006-01-04 22:24:47.000000000 -0800 +++ devel-akpm/drivers/net/hplance.c 2006-01-04 22:24:47.000000000 -0800 @@ -150,7 +150,7 @@ static void __init hplance_init(struct n lp->lance.name = (char*)d->name; /* discards const, shut up gcc */ lp->lance.base = va; lp->lance.init_block = (struct lance_init_block *)(va + HPLANCE_MEMOFF); /* CPU addr */ - lp->lance.lance_init_block = 0; /* LANCE addr of same RAM */ + lp->lance.lance_init_block = NULL; /* LANCE addr of same RAM */ lp->lance.busmaster_regval = LE_C3_BSWP; /* we're bigendian */ lp->lance.irq = d->ipl; lp->lance.writerap = hplance_writerap; diff -puN drivers/net/sun3lance.c~m68k-null-noise-removal drivers/net/sun3lance.c --- devel/drivers/net/sun3lance.c~m68k-null-noise-removal 2006-01-04 22:24:47.000000000 -0800 +++ devel-akpm/drivers/net/sun3lance.c 2006-01-04 22:24:47.000000000 -0800 @@ -389,7 +389,7 @@ static int __init lance_probe( struct ne dev->stop = &lance_close; dev->get_stats = &lance_get_stats; dev->set_multicast_list = &set_multicast_list; - dev->set_mac_address = 0; + dev->set_mac_address = NULL; // KLUDGE -- REMOVE ME set_bit(__LINK_STATE_PRESENT, &dev->state); diff -puN drivers/scsi/wd33c93.c~m68k-null-noise-removal drivers/scsi/wd33c93.c --- devel/drivers/scsi/wd33c93.c~m68k-null-noise-removal 2006-01-04 22:24:47.000000000 -0800 +++ devel-akpm/drivers/scsi/wd33c93.c 2006-01-04 22:24:47.000000000 -0800 @@ -465,7 +465,7 @@ wd33c93_execute(struct Scsi_Host *instan */ cmd = (struct scsi_cmnd *) hostdata->input_Q; - prev = 0; + prev = NULL; while (cmd) { if (!(hostdata->busy[cmd->device->id] & (1 << cmd->device->lun))) break; @@ -1569,7 +1569,7 @@ wd33c93_abort(struct scsi_cmnd * cmd) */ tmp = (struct scsi_cmnd *) hostdata->input_Q; - prev = 0; + prev = NULL; while (tmp) { if (tmp == cmd) { if (prev) diff -puN include/asm-m68k/floppy.h~m68k-null-noise-removal include/asm-m68k/floppy.h --- devel/include/asm-m68k/floppy.h~m68k-null-noise-removal 2006-01-04 22:24:47.000000000 -0800 +++ devel-akpm/include/asm-m68k/floppy.h 2006-01-04 22:24:47.000000000 -0800 @@ -46,7 +46,7 @@ asmlinkage irqreturn_t floppy_hardint(in static int virtual_dma_count=0; static int virtual_dma_residue=0; -static char *virtual_dma_addr=0; +static char *virtual_dma_addr=NULL; static int virtual_dma_mode=0; static int doing_pdma=0; diff -puN include/asm-m68k/sun3xflop.h~m68k-null-noise-removal include/asm-m68k/sun3xflop.h --- devel/include/asm-m68k/sun3xflop.h~m68k-null-noise-removal 2006-01-04 22:24:47.000000000 -0800 +++ devel-akpm/include/asm-m68k/sun3xflop.h 2006-01-04 22:24:47.000000000 -0800 @@ -208,7 +208,7 @@ static int sun3xflop_request_irq(void) if(!once) { once = 1; - error = request_irq(FLOPPY_IRQ, sun3xflop_hardint, SA_INTERRUPT, "floppy", 0); + error = request_irq(FLOPPY_IRQ, sun3xflop_hardint, SA_INTERRUPT, "floppy", NULL); return ((error == 0) ? 0 : -1); } else return 0; } @@ -238,7 +238,7 @@ static int sun3xflop_init(void) *sun3x_fdc.fcr_r = 0; /* Success... */ - floppy_set_flags(0, 1, FD_BROKEN_DCL); // I don't know how to detect this. + floppy_set_flags(NULL, 1, FD_BROKEN_DCL); // I don't know how to detect this. allowed_drive_mask = 0x01; return (int) SUN3X_FDC; } _