aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/amd64/acpica/OsdEnvironment.c4
-rw-r--r--sys/amd64/acpica/acpi_wakeup.c2
-rw-r--r--sys/compat/pecoff/imgact_pecoff.c2
-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
-rw-r--r--sys/i386/acpica/OsdEnvironment.c4
-rw-r--r--sys/i386/acpica/acpi_wakeup.c2
-rw-r--r--sys/kern/vfs_aio.c2
-rw-r--r--sys/net/if_iso88025subr.c2
-rw-r--r--sys/netinet/tcp_usrreq.c4
-rw-r--r--sys/netinet6/ip6_mroute.c2
-rw-r--r--sys/netinet6/ip6_output.c10
21 files changed, 32 insertions, 32 deletions
diff --git a/sys/amd64/acpica/OsdEnvironment.c b/sys/amd64/acpica/OsdEnvironment.c
index cb7f869a3acc..773bbe8df9f5 100644
--- a/sys/amd64/acpica/OsdEnvironment.c
+++ b/sys/amd64/acpica/OsdEnvironment.c
@@ -44,13 +44,13 @@ AcpiOsInitialize(void)
*/
PnPBIOStable = NULL;
- return(NULL);
+ return(0);
}
ACPI_STATUS
AcpiOsTerminate(void)
{
- return(NULL);
+ return(0);
}
ACPI_STATUS
diff --git a/sys/amd64/acpica/acpi_wakeup.c b/sys/amd64/acpica/acpi_wakeup.c
index 462243a62313..d232d0ac70d5 100644
--- a/sys/amd64/acpica/acpi_wakeup.c
+++ b/sys/amd64/acpica/acpi_wakeup.c
@@ -188,7 +188,7 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state)
int pteobj_allocated = 0;
u_long ef;
- if (sc->acpi_wakeaddr == NULL) {
+ if (sc->acpi_wakeaddr == 0) {
return (0);
}
diff --git a/sys/compat/pecoff/imgact_pecoff.c b/sys/compat/pecoff/imgact_pecoff.c
index 66d0d7f38d80..da9a76a1dbed 100644
--- a/sys/compat/pecoff/imgact_pecoff.c
+++ b/sys/compat/pecoff/imgact_pecoff.c
@@ -148,7 +148,7 @@ pecoff_fixup(register_t ** stack_base, struct image_params * imgp)
pos = *stack_base + (imgp->argc + imgp->envc + 2);
ap = (struct pecoff_imghdr *) imgp->auxargs;
if (copyout(ap, pos, len)) {
- return NULL;
+ return 0;
}
free(ap, M_TEMP);
imgp->auxargs = NULL;
diff --git a/sys/dev/asr/asr.c b/sys/dev/asr/asr.c
index c7641fe5abf3..62fdaa0583d0 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 90ca103fd476..ad4dedcb2c90 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 2c74c65bdd7e..8667095a02d7 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 38f63ff79b71..e6e00b93f4f9 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 a2bd50895513..47a8f780a2a9 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 f09140dc37a7..7640604d197e 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 d38a64f2bfc9..f5ae328e32a2 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 d66166fb1717..e9830921def2 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 4c2752e1d554..d81125b717b9 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 75c08089c116..43df8e98760b 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 f349f4c10d0d..38a32ff773d0 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;
diff --git a/sys/i386/acpica/OsdEnvironment.c b/sys/i386/acpica/OsdEnvironment.c
index cb7f869a3acc..773bbe8df9f5 100644
--- a/sys/i386/acpica/OsdEnvironment.c
+++ b/sys/i386/acpica/OsdEnvironment.c
@@ -44,13 +44,13 @@ AcpiOsInitialize(void)
*/
PnPBIOStable = NULL;
- return(NULL);
+ return(0);
}
ACPI_STATUS
AcpiOsTerminate(void)
{
- return(NULL);
+ return(0);
}
ACPI_STATUS
diff --git a/sys/i386/acpica/acpi_wakeup.c b/sys/i386/acpica/acpi_wakeup.c
index 462243a62313..d232d0ac70d5 100644
--- a/sys/i386/acpica/acpi_wakeup.c
+++ b/sys/i386/acpica/acpi_wakeup.c
@@ -188,7 +188,7 @@ acpi_sleep_machdep(struct acpi_softc *sc, int state)
int pteobj_allocated = 0;
u_long ef;
- if (sc->acpi_wakeaddr == NULL) {
+ if (sc->acpi_wakeaddr == 0) {
return (0);
}
diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c
index 39ec50e904c5..b3a267073feb 100644
--- a/sys/kern/vfs_aio.c
+++ b/sys/kern/vfs_aio.c
@@ -1979,7 +1979,7 @@ lio_listio(struct thread *td, struct lio_listio_args *uap)
cbptr = uap->acb_list;
for (i = 0; i < uap->nent; i++) {
iocb = (struct aiocb *)(intptr_t)fuword(&cbptr[i]);
- if (((intptr_t)iocb != -1) && ((intptr_t)iocb != NULL)) {
+ if (((intptr_t)iocb != -1) && ((intptr_t)iocb != 0)) {
error = _aio_aqueue(td, iocb, lj, 0);
if (error == 0)
nentqueued++;
diff --git a/sys/net/if_iso88025subr.c b/sys/net/if_iso88025subr.c
index afb6f4e55332..e95a471c8891 100644
--- a/sys/net/if_iso88025subr.c
+++ b/sys/net/if_iso88025subr.c
@@ -253,7 +253,7 @@ iso88025_output(ifp, m, dst, rt0)
/* Calculate routing info length based on arp table entry */
if (rt && (sdl = (struct sockaddr_dl *)rt->rt_gateway))
- if (SDL_ISO88025(sdl)->trld_rcf != NULL)
+ if (SDL_ISO88025(sdl)->trld_rcf != 0)
rif_len = TR_RCF_RIFLEN(SDL_ISO88025(sdl)->trld_rcf);
/* Generate a generic 802.5 header for the packet */
diff --git a/sys/netinet/tcp_usrreq.c b/sys/netinet/tcp_usrreq.c
index 2b8e3fd1a8b9..491529b1bfad 100644
--- a/sys/netinet/tcp_usrreq.c
+++ b/sys/netinet/tcp_usrreq.c
@@ -971,7 +971,7 @@ tcp6_connect(tp, nam, td)
inp->in6p_laddr = *addr6;
inp->in6p_faddr = sin6->sin6_addr;
inp->inp_fport = sin6->sin6_port;
- if ((sin6->sin6_flowinfo & IPV6_FLOWINFO_MASK) != NULL)
+ if ((sin6->sin6_flowinfo & IPV6_FLOWINFO_MASK) != 0)
inp->in6p_flowinfo = sin6->sin6_flowinfo;
in_pcbrehash(inp);
@@ -1163,7 +1163,7 @@ tcp_attach(so, td)
struct inpcb *inp;
int error;
#ifdef INET6
- int isipv6 = INP_CHECK_SOCKAF(so, AF_INET6) != NULL;
+ int isipv6 = INP_CHECK_SOCKAF(so, AF_INET6) != 0;
#endif
if (so->so_snd.sb_hiwat == 0 || so->so_rcv.sb_hiwat == 0) {
diff --git a/sys/netinet6/ip6_mroute.c b/sys/netinet6/ip6_mroute.c
index 9af7e819888a..786d088090dd 100644
--- a/sys/netinet6/ip6_mroute.c
+++ b/sys/netinet6/ip6_mroute.c
@@ -1796,7 +1796,7 @@ pim6_input(mp, offp, proto)
#endif
rc = if_simloop(mif6table[reg_mif_num].m6_ifp, m,
- dst.sin6_family, NULL);
+ dst.sin6_family, 0);
/* prepare the register head to send to the mrouting daemon */
m = mcp;
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 52f3e5ef55af..bb3e079aaeb0 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1296,10 +1296,10 @@ ip6_ctloutput(so, sopt)
struct mbuf *m;
error = soopt_getm(sopt, &m); /* XXX */
- if (error != NULL)
+ if (error != 0)
break;
error = soopt_mcopyin(sopt, m); /* XXX */
- if (error != NULL)
+ if (error != 0)
break;
error = ip6_pcbopts(&in6p->in6p_outputopts,
m, so, sopt);
@@ -1646,10 +1646,10 @@ do { \
struct mbuf **mp = &m;
error = soopt_getm(sopt, &m); /* XXX */
- if (error != NULL)
+ if (error != 0)
break;
error = soopt_mcopyin(sopt, m); /* XXX */
- if (error != NULL)
+ if (error != 0)
break;
if (m) {
req = mtod(m, caddr_t);
@@ -2496,7 +2496,7 @@ ip6_mloopback(ifp, m, dst)
in6_clearscope(&ip6->ip6_dst);
#endif
- (void)if_simloop(ifp, copym, dst->sin6_family, NULL);
+ (void)if_simloop(ifp, copym, dst->sin6_family, 0);
}
/*
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-27 00:28:04 +0000