diff options
author | mux <mux@FreeBSD.org> | 2004-02-22 16:27:28 +0000 |
---|---|---|
committer | mux <mux@FreeBSD.org> | 2004-02-22 16:27:28 +0000 |
commit | 1a5b1baf32c497f1f1662a30086a8ea581567739 (patch) | |
tree | 028f1ea9e51c804834f58385287c59f5f34e44eb /sys | |
parent | 01d59d6bbb5b5f5108b1f5454d11ff3b3be2dad6 (diff) | |
download | FreeBSD-src-1a5b1baf32c497f1f1662a30086a8ea581567739.zip FreeBSD-src-1a5b1baf32c497f1f1662a30086a8ea581567739.tar.gz |
Unbreak after the change to use vm_paddr_t. Since vm_paddr_t is
an integer type and the a cast to (void *) was added in the
definition of NULL for the kernel, we need to use 0 here instead.
Partly submitted by: cperciva
Diffstat (limited to 'sys')
-rw-r--r-- | sys/dev/hfa/fore_command.c | 4 | ||||
-rw-r--r-- | sys/dev/hfa/fore_output.c | 2 | ||||
-rw-r--r-- | sys/dev/hfa/fore_stats.c | 2 | ||||
-rw-r--r-- | sys/dev/hfa/fore_transmit.c | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/sys/dev/hfa/fore_command.c b/sys/dev/hfa/fore_command.c index fccb659..84b3680 100644 --- a/sys/dev/hfa/fore_command.c +++ b/sys/dev/hfa/fore_command.c @@ -105,7 +105,7 @@ fore_cmd_allocate(fup) fup->fu_cmd_stat = (Q_status *) memp; pmemp = vtophys(fup->fu_cmd_stat); - if (pmemp == NULL) { + if (pmemp == 0) { return (1); } fup->fu_cmd_statd = pmemp; @@ -458,7 +458,7 @@ fore_cmd_free(fup) if (fup->fu_cmd_stat) { atm_dev_free((volatile void *)fup->fu_cmd_stat); fup->fu_cmd_stat = NULL; - fup->fu_cmd_statd = NULL; + fup->fu_cmd_statd = 0; } return; diff --git a/sys/dev/hfa/fore_output.c b/sys/dev/hfa/fore_output.c index c8156ec..a37e2ec 100644 --- a/sys/dev/hfa/fore_output.c +++ b/sys/dev/hfa/fore_output.c @@ -405,7 +405,7 @@ retry: * Get a DMA address for the data */ dma = vtophys(bfr); - if (dma == NULL) { + if (dma == 0) { fup->fu_stats->st_drv.drv_xm_segdma++; fore_seg_dma_free(hxp, m0, nsegs); KB_FREEALL(m0); diff --git a/sys/dev/hfa/fore_stats.c b/sys/dev/hfa/fore_stats.c index 3440334..17f1657 100644 --- a/sys/dev/hfa/fore_stats.c +++ b/sys/dev/hfa/fore_stats.c @@ -147,7 +147,7 @@ fore_get_stats(fup) (*hcp->hcq_status) = QSTAT_PENDING; dma = vtophys(fup->fu_stats); - if (dma == NULL) { + if (dma == 0) { fup->fu_stats->st_drv.drv_cm_nodma++; (void) splx(s); return (EIO); diff --git a/sys/dev/hfa/fore_transmit.c b/sys/dev/hfa/fore_transmit.c index 6687c6e..84c9adf 100644 --- a/sys/dev/hfa/fore_transmit.c +++ b/sys/dev/hfa/fore_transmit.c @@ -94,7 +94,7 @@ fore_xmit_allocate(fup) fup->fu_xmit_stat = (Q_status *) memp; pmemp = vtophys(fup->fu_xmit_stat); - if (pmemp == NULL) { + if (pmemp == 0) { return (1); } fup->fu_xmit_statd = pmemp; @@ -120,7 +120,7 @@ fore_xmit_allocate(fup) } hxp->hxq_descr_dma = vtophys(hxp->hxq_descr); - if (hxp->hxq_descr_dma == NULL) { + if (hxp->hxq_descr_dma == 0) { return (1); } } @@ -356,7 +356,7 @@ fore_xmit_free(fup) if (fup->fu_xmit_stat) { atm_dev_free((volatile void *)fup->fu_xmit_stat); fup->fu_xmit_stat = NULL; - fup->fu_xmit_statd = NULL; + fup->fu_xmit_statd = 0; } /* @@ -369,7 +369,7 @@ fore_xmit_free(fup) * Free the transmit descriptor for this queue entry */ if (hxp->hxq_descr_dma) { - hxp->hxq_descr_dma = NULL; + hxp->hxq_descr_dma = 0; } if (hxp->hxq_descr) { |