[PATCH] more NULL noise removal

Signed-off-by: Al Viro <viro@parcelfarce.linux.org.uk>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

drivers/isdn/hardware/eicon/debug.c

@@ -1804,7 +1804,7 @@ static void diva_maint_trace_notify (void* user_context,
     */
   if ((id >= 0) && (ch >= 0) && (id < sizeof(clients)/sizeof(clients[0])) &&
       (clients[id].Dbg.id == (byte)id) && (clients[id].pIdiLib == hLib)) {
-    const char* p = 0;
+    const char* p = NULL;
     int ch_value = -1;
     MI_XLOG_HDR *TrcData = (MI_XLOG_HDR *)xlog_buffer;
 
@@ -2096,7 +2096,7 @@ static int diva_get_dma_descriptor (IDI_CALL request, dword *dma_magic) {
 
   pReq->xdi_dma_descriptor_operation.info.operation =     IDI_SYNC_REQ_DMA_DESCRIPTOR_ALLOC;
   pReq->xdi_dma_descriptor_operation.info.descriptor_number  = -1;
-  pReq->xdi_dma_descriptor_operation.info.descriptor_address = 0;
+  pReq->xdi_dma_descriptor_operation.info.descriptor_address = NULL;
   pReq->xdi_dma_descriptor_operation.info.descriptor_magic   = 0;
 
   (*request)((ENTITY*)pReq);
@@ -2124,7 +2124,7 @@ static void diva_free_dma_descriptor (IDI_CALL request, int nr) {
 
   pReq->xdi_dma_descriptor_operation.info.operation = IDI_SYNC_REQ_DMA_DESCRIPTOR_FREE;
   pReq->xdi_dma_descriptor_operation.info.descriptor_number  = nr;
-  pReq->xdi_dma_descriptor_operation.info.descriptor_address = 0;
+  pReq->xdi_dma_descriptor_operation.info.descriptor_address = NULL;
   pReq->xdi_dma_descriptor_operation.info.descriptor_magic   = 0;
 
   (*request)((ENTITY*)pReq);

drivers/isdn/hardware/eicon/divamnt.c

@@ -144,7 +144,7 @@ static int maint_close(struct inode *ino, struct file *filep)
 {
 	if (filep->private_data) {
 		diva_os_free(0, filep->private_data);
-		filep->private_data = 0;
+		filep->private_data = NULL;
 	}
 
 	/* clear 'used' flag */

drivers/message/i2o/iop.c

@@ -289,7 +289,7 @@ struct i2o_device *i2o_iop_find_device(struct i2o_controller *c, u16 tid)
 	    if (dev->lct_data.tid == tid)
 		return dev;
 
-	return 0;
+	return NULL;
 };
 
 /**
@@ -978,7 +978,7 @@ int i2o_status_get(struct i2o_controller *c)
 		rmb();
 	}
 
-#if DEBUG
+#ifdef DEBUG
 	i2o_debug_state(c);
 #endif
 

drivers/mtd/maps/nettel.c

@@ -180,7 +180,7 @@ int nettel_eraseconfig(void)
 	if (mtd) {
 		nettel_erase.mtd = mtd;
 		nettel_erase.callback = nettel_erasecallback;
-		nettel_erase.callback = 0;
+		nettel_erase.callback = NULL;
 		nettel_erase.addr = 0;
 		nettel_erase.len = mtd->size;
 		nettel_erase.priv = (u_long) &wait_q;

drivers/scsi/megaraid/megaraid_mbox.c

@@ -2307,7 +2307,7 @@ megaraid_isr(int irq, void *devp, struct pt_regs *regs)
 
 	/* Loop through any pending requests */
 	if (!adapter->quiescent) {
-		megaraid_mbox_runpendq(adapter, 0);
+		megaraid_mbox_runpendq(adapter, NULL);
 	}
 
 	return IRQ_RETVAL(handled);
@@ -3839,7 +3839,7 @@ megaraid_mbox_mm_done(adapter_t *adapter, scb_t *scb)
 
 		adapter->quiescent--;
 
-		megaraid_mbox_runpendq(adapter, 0);
+		megaraid_mbox_runpendq(adapter, NULL);
 	}
 
 	kioc->done(kioc);

drivers/scsi/megaraid/megaraid_mm.c

@@ -473,7 +473,7 @@ mraid_mm_attach_buf(mraid_mmadp_t *adp, uioc_t *kioc, int xferlen)
 	int		i;
 
 	kioc->pool_index	= -1;
-	kioc->buf_vaddr		= 0;
+	kioc->buf_vaddr		= NULL;
 	kioc->buf_paddr		= 0;
 	kioc->free_buf		= 0;
 
@@ -573,13 +573,13 @@ mraid_mm_alloc_kioc(mraid_mmadp_t *adp)
 	memset((caddr_t)(unsigned long)kioc->cmdbuf, 0, sizeof(mbox64_t));
 	memset((caddr_t) kioc->pthru32, 0, sizeof(mraid_passthru_t));
 
-	kioc->buf_vaddr		= 0;
+	kioc->buf_vaddr		= NULL;
 	kioc->buf_paddr		= 0;
 	kioc->pool_index	=-1;
 	kioc->free_buf		= 0;
-	kioc->user_data		= 0;
+	kioc->user_data		= NULL;
 	kioc->user_data_len	= 0;
-	kioc->user_pthru	= 0;
+	kioc->user_pthru	= NULL;
 
 	return kioc;
 }
@@ -1091,7 +1091,7 @@ mraid_mm_teardown_dma_pools(mraid_mmadp_t *adp)
 							pool->paddr);
 
 			pci_pool_destroy(pool->handle);
-			pool->handle = 0;
+			pool->handle = NULL;
 		}
 	}