Change a bunch of (<blah> *)0 to NULL.

ok beck@ deraadt@

6 files changed, 21 insertions, 21 deletions

diff --git a/sys/dev/ic/bha.c b/sys/dev/ic/bha.c
index f0ac3d58fca..a1083b11956 100644
--- a/sys/dev/ic/bha.c
+++ b/sys/dev/ic/bha.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bha.c,v 1.30 2014/09/14 14:17:24 jsg Exp $	*/
+/*	$OpenBSD: bha.c,v 1.31 2016/03/14 23:08:05 krw Exp $	*/
 /*	$NetBSD: bha.c,v 1.27 1998/11/19 21:53:00 thorpej Exp $	*/
 
 #undef BHADEBUG
@@ -438,7 +438,7 @@ bha_intr(arg)
 		toggle.cmd.enable = 0;
 		bha_cmd(iot, ioh, sc,
 		    sizeof(toggle.cmd), (u_char *)&toggle.cmd,
-		    0, (u_char *)0);
+		    0, NULL);
 		bha_start_ccbs(sc);
 	}
 
@@ -648,7 +648,7 @@ bha_start_ccbs(sc)
 				toggle.cmd.enable = 1;
 				bha_cmd(iot, ioh, sc,
 				    sizeof(toggle.cmd), (u_char *)&toggle.cmd,
-				    0, (u_char *)0);
+				    0, NULL);
 				break;
 			}
 		}
@@ -952,7 +952,7 @@ bha_disable_isacompat(sc)
 	isa_disable.cmd.modifier = BHA_IOMODIFY_DISABLE1;
 	bha_cmd(sc->sc_iot, sc->sc_ioh, sc,
 	    sizeof(isa_disable.cmd), (u_char *)&isa_disable.cmd,
-	    0, (u_char *)0);
+	    0, NULL);
 	return (0);
 }
 
@@ -981,7 +981,7 @@ bha_init(sc)
 		toggle.cmd.enable = 1;
 		bha_cmd(iot, ioh, sc,
 		    sizeof(toggle.cmd), (u_char *)&toggle.cmd,
-		    0, (u_char *)0);
+		    0, NULL);
 	}
 
 	/*
@@ -1154,7 +1154,7 @@ bha_init(sc)
 	    offsetof(struct bha_control, bc_mbx), mailbox.cmd.addr);
 	bha_cmd(iot, ioh, sc,
 	    sizeof(mailbox.cmd), (u_char *)&mailbox.cmd,
-	    0, (u_char *)0);
+	    0, NULL);
 	return (0);
 }
 
diff --git a/sys/dev/ic/i82596.c b/sys/dev/ic/i82596.c
index f5b19aa407e..d97deeab057 100644
--- a/sys/dev/ic/i82596.c
+++ b/sys/dev/ic/i82596.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: i82596.c,v 1.50 2015/12/08 13:34:22 tedu Exp $	*/
+/*	$OpenBSD: i82596.c,v 1.51 2016/03/14 23:08:05 krw Exp $	*/
 /*	$NetBSD: i82586.c,v 1.18 1998/08/15 04:42:42 mycroft Exp $	*/
 
 /*-
@@ -1924,7 +1924,7 @@ ie_mc_reset(sc)
 
 	if (ac->ac_multicnt >= IE_MAXMCAST || ac->ac_multirangecnt > 0) {
 		ac->ac_if.if_flags |= IFF_ALLMULTI;
-		i82596_ioctl(&ac->ac_if, SIOCSIFFLAGS, (void *)0);
+		i82596_ioctl(&ac->ac_if, SIOCSIFFLAGS, NULL);
 		return;
 	}
 
diff --git a/sys/dev/isa/aha.c b/sys/dev/isa/aha.c
index 7e09e4330f6..7546f98b525 100644
--- a/sys/dev/isa/aha.c
+++ b/sys/dev/isa/aha.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: aha.c,v 1.80 2014/12/17 06:58:10 guenther Exp $	*/
+/*	$OpenBSD: aha.c,v 1.81 2016/03/14 23:08:06 krw Exp $	*/
 /*	$NetBSD: aha.c,v 1.11 1996/05/12 23:51:23 mycroft Exp $	*/
 
 #undef AHADIAG
@@ -536,7 +536,7 @@ ahaintr(arg)
 		toggle.cmd.opcode = AHA_MBO_INTR_EN;
 		toggle.cmd.enable = 0;
 		aha_cmd(iobase, sc, sizeof(toggle.cmd), (u_char *)&toggle.cmd,
-		    0, (u_char *)0);
+		    0, NULL);
 		aha_start_ccbs(sc);
 	}
 
@@ -756,7 +756,7 @@ aha_start_ccbs(sc)
 				toggle.cmd.opcode = AHA_MBO_INTR_EN;
 				toggle.cmd.enable = 1;
 				aha_cmd(iobase, sc, sizeof(toggle.cmd),
-				    (u_char *)&toggle.cmd, 0, (u_char *)0);
+				    (u_char *)&toggle.cmd, 0, NULL);
 				break;
 			}
 		}
@@ -1031,7 +1031,7 @@ aha_init(sc)
 		unlock.cmd.junk = 0;
 		unlock.cmd.magic = extbios.reply.mailboxlock;
 		aha_cmd(iobase, sc, sizeof(unlock.cmd), (u_char *)&unlock.cmd,
-		    0, (u_char *)0);
+		    0, NULL);
 	}
 
 #if 0
@@ -1108,7 +1108,7 @@ aha_init(sc)
 	mailbox.cmd.nmbx = AHA_MBX_SIZE;
 	ltophys(vtophys((vaddr_t)wmbx), mailbox.cmd.addr);
 	aha_cmd(iobase, sc, sizeof(mailbox.cmd), (u_char *)&mailbox.cmd,
-	    0, (u_char *)0);
+	    0, NULL);
 }
 
 void
diff --git a/sys/dev/isa/if_ie.c b/sys/dev/isa/if_ie.c
index 79a0e731040..649ced9d63b 100644
--- a/sys/dev/isa/if_ie.c
+++ b/sys/dev/isa/if_ie.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_ie.c,v 1.49 2015/12/08 13:34:22 tedu Exp $	*/
+/*	$OpenBSD: if_ie.c,v 1.50 2016/03/14 23:08:06 krw Exp $	*/
 /*	$NetBSD: if_ie.c,v 1.51 1996/05/12 23:52:48 mycroft Exp $	*/
 
 /*-
@@ -2082,7 +2082,7 @@ mc_reset(sc)
 
 	if (ac->ac_multirangecnt > 0) {
 		ac->ac_if.if_flags |= IFF_ALLMULTI;
-		ieioctl(&ac->ac_if, SIOCSIFFLAGS, (void *)0);
+		ieioctl(&ac->ac_if, SIOCSIFFLAGS, NULL);
 		goto setflag;
 	}
 	/*
@@ -2093,7 +2093,7 @@ mc_reset(sc)
 	while (enm) {
 		if (sc->mcast_count >= MAXMCAST) {
 			ac->ac_if.if_flags |= IFF_ALLMULTI;
-			ieioctl(&ac->ac_if, SIOCSIFFLAGS, (void *)0);
+			ieioctl(&ac->ac_if, SIOCSIFFLAGS, NULL);
 			goto setflag;
 		}
 
diff --git a/sys/dev/pci/bktr/bktr_core.c b/sys/dev/pci/bktr/bktr_core.c
index 05d7d9f1700..40f3359e336 100644
--- a/sys/dev/pci/bktr/bktr_core.c
+++ b/sys/dev/pci/bktr/bktr_core.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: bktr_core.c,v 1.37 2016/02/15 19:21:46 stefan Exp $	*/
+/*	$OpenBSD: bktr_core.c,v 1.38 2016/03/14 23:08:06 krw Exp $	*/
 /* $FreeBSD: src/sys/dev/bktr/bktr_core.c,v 1.114 2000/10/31 13:09:56 roger Exp $ */
 
 /*
@@ -880,7 +880,7 @@ video_open( bktr_ptr_t bktr )
 	bktr->frames_captured = 0;
 	bktr->even_fields_captured = 0;
 	bktr->odd_fields_captured = 0;
-	bktr->proc = (struct proc *)0;
+	bktr->proc = NULL;
 	set_fps(bktr, frame_rate);
 	bktr->video.addr = 0;
 	bktr->video.width = 0;
diff --git a/sys/dev/pcmcia/gpr.c b/sys/dev/pcmcia/gpr.c
index b35ec42a5a8..46902793854 100644
--- a/sys/dev/pcmcia/gpr.c
+++ b/sys/dev/pcmcia/gpr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: gpr.c,v 1.16 2011/07/03 15:47:17 matthew Exp $	*/
+/*	$OpenBSD: gpr.c,v 1.17 2016/03/14 23:08:06 krw Exp $	*/
 
 /*
  * Copyright (c) 2002, Federico G. Schwindt
@@ -275,7 +275,7 @@ gprclose(dev_t dev, int flags, int mode, struct proc *p)
 
 	DPRINTF(("%s: flags %d, mode %d\n", __func__, flags, mode));
 
-	(void)tlvput(sc, GPR400_CLOSE, (u_int8_t *)0, 0);
+	(void)tlvput(sc, GPR400_CLOSE, NULL, 0);
 
 	return (0);
 }
@@ -331,7 +331,7 @@ gprioctl(dev_t dev, u_long cmd, caddr_t addr, int flags, struct proc *p)
 		break;
 
 	case GPR_CLOSE:
-		error = tlvput(sc, GPR400_CLOSE, (u_int8_t *)0, 0);
+		error = tlvput(sc, GPR400_CLOSE, NULL, 0);
 		break;
 
 	case GPR_RAM: