diff options
| author | dwmalone <dwmalone@FreeBSD.org> | 2000-12-08 21:51:06 +0000 |
|---|---|---|
| committer | dwmalone <dwmalone@FreeBSD.org> | 2000-12-08 21:51:06 +0000 |
| commit | dd75d1d73b4f3034c1d9f621a49fff58b1d71eb1 (patch) | |
| tree | 197ae73617ae75afe008897f6906b84835589ea2 /sys/dev/isp | |
| parent | ed5dbfbd3cd619638a7baac288f548aa1398edac (diff) | |
| download | FreeBSD-src-dd75d1d73b4f3034c1d9f621a49fff58b1d71eb1.zip FreeBSD-src-dd75d1d73b4f3034c1d9f621a49fff58b1d71eb1.tar.gz | |
Convert more malloc+bzero to malloc+M_ZERO.
Submitted by: josh@zipperup.org
Submitted by: Robert Drehmel <robd@gmx.net>
Diffstat (limited to 'sys/dev/isp')
| -rw-r--r-- | sys/dev/isp/isp_pci.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/sys/dev/isp/isp_pci.c b/sys/dev/isp/isp_pci.c index 683ac4a..b559906 100644 --- a/sys/dev/isp/isp_pci.c +++ b/sys/dev/isp/isp_pci.c @@ -317,12 +317,11 @@ isp_pci_attach(device_t dev) } } - pcs = malloc(sizeof (struct isp_pcisoftc), M_DEVBUF, M_NOWAIT); + pcs = malloc(sizeof (struct isp_pcisoftc), M_DEVBUF, M_NOWAIT | M_ZERO); if (pcs == NULL) { device_printf(dev, "cannot allocate softc\n"); return (ENOMEM); } - bzero(pcs, sizeof (struct isp_pcisoftc)); /* * Figure out which we should try first - memory mapping or i/o mapping? @@ -443,12 +442,11 @@ isp_pci_attach(device_t dev) PCI_MBOX_REGS2100_OFF; } isp = &pcs->pci_isp; - isp->isp_param = malloc(psize, M_DEVBUF, M_NOWAIT); + isp->isp_param = malloc(psize, M_DEVBUF, M_NOWAIT | M_ZERO); if (isp->isp_param == NULL) { device_printf(dev, "cannot allocate parameter data\n"); goto bad; } - bzero(isp->isp_param, psize); isp->isp_mdvec = mdvp; isp->isp_type = basetype; isp->isp_revision = pci_get_revid(dev); @@ -850,12 +848,11 @@ isp_pci_mbxdma(struct ispsoftc *isp) } len = sizeof (XS_T **) * isp->isp_maxcmds; - isp->isp_xflist = (XS_T **) malloc(len, M_DEVBUF, M_WAITOK); + isp->isp_xflist = (XS_T **) malloc(len, M_DEVBUF, M_WAITOK | M_ZERO); if (isp->isp_xflist == NULL) { isp_prt(isp, ISP_LOGERR, "cannot alloc xflist array"); return (1); } - bzero(isp->isp_xflist, len); len = sizeof (bus_dmamap_t) * isp->isp_maxcmds; pci->dmaps = (bus_dmamap_t *) malloc(len, M_DEVBUF, M_WAITOK); if (pci->dmaps == NULL) { |
