summaryrefslogtreecommitdiffstats
path: root/sys/dev
diff options
context:
space:
mode:
Diffstat (limited to 'sys/dev')
-rw-r--r--sys/dev/asr/asr.c2
-rw-r--r--sys/dev/ciss/ciss.c2
-rw-r--r--sys/dev/digi/digi_isa.c4
-rw-r--r--sys/dev/gx/if_gx.c2
-rw-r--r--sys/dev/hfa/fore_buffer.c4
-rw-r--r--sys/dev/md/md.c2
-rw-r--r--sys/dev/mly/mly.c4
-rw-r--r--sys/dev/nsp/nsp.c4
-rw-r--r--sys/dev/sound/pcm/channel.c2
-rw-r--r--sys/dev/twe/twe.c2
-rw-r--r--sys/dev/usb/usbdi_util.c2
11 files changed, 15 insertions, 15 deletions
diff --git a/sys/dev/asr/asr.c b/sys/dev/asr/asr.c
index c7641fe..62fdaa0 100644
--- a/sys/dev/asr/asr.c
+++ b/sys/dev/asr/asr.c
@@ -1712,7 +1712,7 @@ ASR_queue(
I2O_SGL_FLAGS_SIMPLE_ADDRESS_ELEMENT | (Flags)); \
I2O_SGE_SIMPLE_ELEMENT_setPhysicalAddress( \
&(((PI2O_SG_ELEMENT)(SGL))->u.Simple[Index]), \
- (Buffer == NULL) ? NULL : KVTOPHYS(Buffer))
+ (Buffer == NULL) ? 0 : KVTOPHYS(Buffer))
/*
* Retrieve Parameter Group.
diff --git a/sys/dev/ciss/ciss.c b/sys/dev/ciss/ciss.c
index 90ca103..ad4dedc 100644
--- a/sys/dev/ciss/ciss.c
+++ b/sys/dev/ciss/ciss.c
@@ -241,7 +241,7 @@ static struct
{ 0x0e11, 0x4070, CISS_BOARD_SA5, "Compaq Smart Array 5300" },
{ 0x0e11, 0x4080, CISS_BOARD_SA5B, "Compaq Smart Array 5i" },
{ 0x0e11, 0x4082, CISS_BOARD_SA5B, "Compaq Smart Array 532" },
- { 0, 0, NULL }
+ { 0, 0, 0, NULL }
};
/************************************************************************
diff --git a/sys/dev/digi/digi_isa.c b/sys/dev/digi/digi_isa.c
index 2c74c65..8667095 100644
--- a/sys/dev/digi/digi_isa.c
+++ b/sys/dev/digi/digi_isa.c
@@ -114,7 +114,7 @@ digi_isa_check(struct digi_softc *sc)
outb(sc->port, FEPRST);
for (i = 0; (inb(sc->port) & FEPMASK) != FEPRST; i++) {
if (i == hz / 10)
- return (NULL);
+ return (0);
digi_delay(sc, "digirst", 1);
}
DLOG(DIGIDB_INIT, (sc->dev, "got reset after %d iterations\n", i));
@@ -188,7 +188,7 @@ digi_isa_check(struct digi_softc *sc)
if (ident & 0x1) {
device_printf(sc->dev, "PC/Xm is unsupported\n");
- return (NULL);
+ return (0);
}
sc->mem_seg = 0xf000;
diff --git a/sys/dev/gx/if_gx.c b/sys/dev/gx/if_gx.c
index 38f63ff..e6e00b9 100644
--- a/sys/dev/gx/if_gx.c
+++ b/sys/dev/gx/if_gx.c
@@ -119,7 +119,7 @@ static struct gx_device gx_devs[] = {
8 | 8 << 10 | 6 << 20,
"Intel Gigabit Ethernet (82544GC-T)" },
#endif
- { 0, 0, 0, NULL }
+ { 0, 0, 0, 0, NULL }
};
static struct gx_regs new_regs = {
diff --git a/sys/dev/hfa/fore_buffer.c b/sys/dev/hfa/fore_buffer.c
index a2bd508..47a8f78 100644
--- a/sys/dev/hfa/fore_buffer.c
+++ b/sys/dev/hfa/fore_buffer.c
@@ -406,7 +406,7 @@ fore_buf_supply_1s(fup)
bdp->bsd_handle = bhp;
KB_DATASTART(m, cp, caddr_t);
bhp->bh_dma = bdp->bsd_buffer = vtophys(cp);
- if (bdp->bsd_buffer == NULL) {
+ if (bdp->bsd_buffer == 0) {
/*
* Unable to assign dma address - free up
* this descriptor's buffer
@@ -546,7 +546,7 @@ fore_buf_supply_1l(fup)
bdp->bsd_handle = bhp;
KB_DATASTART(m, cp, caddr_t);
bhp->bh_dma = bdp->bsd_buffer = vtophys(cp);
- if (bdp->bsd_buffer == NULL) {
+ if (bdp->bsd_buffer == 0) {
/*
* Unable to assign dma address - free up
* this descriptor's buffer
diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c
index f09140d..7640604 100644
--- a/sys/dev/md/md.c
+++ b/sys/dev/md/md.c
@@ -349,7 +349,7 @@ s_write(struct indir *ip, off_t offset, uintptr_t ptr)
up = lip[li]->array[idx];
KASSERT(up == (uintptr_t)cip, ("md screwed up"));
del_indir(cip);
- lip[li]->array[idx] = NULL;
+ lip[li]->array[idx] = 0;
lip[li]->used--;
cip = lip[li];
}
diff --git a/sys/dev/mly/mly.c b/sys/dev/mly/mly.c
index d38a64f..f5ae328 100644
--- a/sys/dev/mly/mly.c
+++ b/sys/dev/mly/mly.c
@@ -1505,11 +1505,11 @@ mly_start(struct mly_command *mc)
/* copy in new command */
bcopy(mc->mc_packet->mmbox.data, pkt->mmbox.data, sizeof(pkt->mmbox.data));
/* barrier to ensure completion of previous write before we write the flag */
- bus_space_barrier(NULL, NULL, 0, 0, BUS_SPACE_BARRIER_WRITE); /* tag/handle? */
+ bus_space_barrier(0, 0, 0, 0, BUS_SPACE_BARRIER_WRITE); /* tag/handle? */
/* copy flag last */
pkt->mmbox.flag = mc->mc_packet->mmbox.flag;
/* barrier to ensure completion of previous write before we notify the controller */
- bus_space_barrier(NULL, NULL, 0, 0, BUS_SPACE_BARRIER_WRITE); /* tag/handle */
+ bus_space_barrier(0, 0, 0, 0, BUS_SPACE_BARRIER_WRITE); /* tag/handle */
/* signal controller, update index */
MLY_SET_REG(sc, sc->mly_idbr, MLY_AM_CMDSENT);
diff --git a/sys/dev/nsp/nsp.c b/sys/dev/nsp/nsp.c
index d66166f..e983092 100644
--- a/sys/dev/nsp/nsp.c
+++ b/sys/dev/nsp/nsp.c
@@ -727,7 +727,7 @@ nsp_setup_fifo(sc, on, direction, datalen)
/* determine a transfer type */
if (datalen < DEV_BSIZE || (datalen & 3) != 0)
{
- if (sc->sc_memh != NULL &&
+ if (sc->sc_memh != 0 &&
(nsp_io_control & NSP_USE_MEMIO) != 0)
xfermode = XFERMR_XEN | XFERMR_MEM8;
else
@@ -735,7 +735,7 @@ nsp_setup_fifo(sc, on, direction, datalen)
}
else
{
- if (sc->sc_memh != NULL &&
+ if (sc->sc_memh != 0 &&
(nsp_io_control & NSP_USE_MEMIO) != 0)
xfermode = XFERMR_XEN | XFERMR_MEM32;
else
diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c
index 4c2752e..d81125b 100644
--- a/sys/dev/sound/pcm/channel.c
+++ b/sys/dev/sound/pcm/channel.c
@@ -1124,7 +1124,7 @@ chn_buildfeeder(struct pcm_channel *c)
} else {
if (c->direction == PCMDIR_REC) {
tmp[0] = c->format;
- tmp[1] = NULL;
+ tmp[1] = 0;
hwfmt = chn_fmtchain(c, tmp);
} else {
hwfmt = chn_fmtchain(c, chn_getcaps(c)->fmtlist);
diff --git a/sys/dev/twe/twe.c b/sys/dev/twe/twe.c
index 75c0808..43df8e9 100644
--- a/sys/dev/twe/twe.c
+++ b/sys/dev/twe/twe.c
@@ -824,7 +824,7 @@ twe_init_connection(struct twe_softc *sc, int mode)
/* get a command */
if (twe_get_request(sc, &tr))
- return(NULL);
+ return(0);
/* build the command */
cmd = &tr->tr_command;
diff --git a/sys/dev/usb/usbdi_util.c b/sys/dev/usb/usbdi_util.c
index f349f4c..38a32ff 100644
--- a/sys/dev/usb/usbdi_util.c
+++ b/sys/dev/usb/usbdi_util.c
@@ -289,7 +289,7 @@ usbd_get_report(usbd_interface_handle iface, int type, int id, void *data,
usb_device_request_t req;
DPRINTFN(4, ("usbd_set_report: len=%d\n", len));
- if (id == NULL)
+ if (id == 0)
return (USBD_IOERROR);
usbd_interface2device_handle(iface, &dev);
req.bmRequestType = UT_READ_CLASS_INTERFACE;
OpenPOWER on IntegriCloud