summaryrefslogtreecommitdiffstats
path: root/sys/pci
diff options
context:
space:
mode:
Diffstat (limited to 'sys/pci')
-rw-r--r--sys/pci/if_fxp.c7
-rw-r--r--sys/pci/if_mn.c6
-rw-r--r--sys/pci/if_tx.c3
-rw-r--r--sys/pci/isp_pci.c9
-rw-r--r--sys/pci/ncr.c11
-rw-r--r--sys/pci/pci.c11
-rw-r--r--sys/pci/pci_compat.c3
-rw-r--r--sys/pci/simos.c3
8 files changed, 17 insertions, 36 deletions
diff --git a/sys/pci/if_fxp.c b/sys/pci/if_fxp.c
index 6544f56..13cd0fd 100644
--- a/sys/pci/if_fxp.c
+++ b/sys/pci/if_fxp.c
@@ -587,15 +587,14 @@ fxp_attach_common(sc, enaddr)
DELAY(10);
sc->cbl_base = malloc(sizeof(struct fxp_cb_tx) * FXP_NTXCB,
- M_DEVBUF, M_NOWAIT);
+ M_DEVBUF, M_NOWAIT | M_ZERO);
if (sc->cbl_base == NULL)
goto fail;
- bzero(sc->cbl_base, sizeof(struct fxp_cb_tx) * FXP_NTXCB);
- sc->fxp_stats = malloc(sizeof(struct fxp_stats), M_DEVBUF, M_NOWAIT);
+ sc->fxp_stats = malloc(sizeof(struct fxp_stats), M_DEVBUF,
+ M_NOWAIT | M_ZERO);
if (sc->fxp_stats == NULL)
goto fail;
- bzero(sc->fxp_stats, sizeof(struct fxp_stats));
sc->mcsp = malloc(sizeof(struct fxp_cb_mcs), M_DEVBUF, M_NOWAIT);
if (sc->mcsp == NULL)
diff --git a/sys/pci/if_mn.c b/sys/pci/if_mn.c
index 703c6e5..8c222ba 100644
--- a/sys/pci/if_mn.c
+++ b/sys/pci/if_mn.c
@@ -724,8 +724,7 @@ mn_create_channel(struct softc *sc, int chan)
struct schan *sch;
sch = sc->ch[chan] = (struct schan *)malloc(sizeof *sc->ch[chan],
- M_MN, M_WAITOK);
- bzero(sch, sizeof *sch);
+ M_MN, M_WAITOK | M_ZERO);
sch->sc = sc;
sch->state = DOWN;
sch->chan = chan;
@@ -1216,8 +1215,7 @@ mn_attach (device_t self)
once++;
}
- sc = (struct softc *)malloc(sizeof *sc, M_MN, M_WAITOK);
- bzero(sc, sizeof *sc);
+ sc = (struct softc *)malloc(sizeof *sc, M_MN, M_WAITOK | M_ZERO);
device_set_softc(self, sc);
sc->dev = self;
diff --git a/sys/pci/if_tx.c b/sys/pci/if_tx.c
index 0080611..ca2a89d 100644
--- a/sys/pci/if_tx.c
+++ b/sys/pci/if_tx.c
@@ -747,13 +747,12 @@ epic_common_attach(sc)
i = sizeof(struct epic_frag_list)*TX_RING_SIZE +
sizeof(struct epic_rx_desc)*RX_RING_SIZE +
sizeof(struct epic_tx_desc)*TX_RING_SIZE + PAGE_SIZE,
- sc->pool = (epic_softc_t *) malloc( i, M_DEVBUF, M_NOWAIT);
+ sc->pool = (epic_softc_t *) malloc(i, M_DEVBUF, M_NOWAIT | M_ZERO);
if (sc->pool == NULL) {
printf(": can't allocate memory for buffers\n");
return -1;
}
- bzero(sc->pool, i);
/* Align pool on PAGE_SIZE */
pool = (caddr_t)sc->pool;
diff --git a/sys/pci/isp_pci.c b/sys/pci/isp_pci.c
index 683ac4a..b559906 100644
--- a/sys/pci/isp_pci.c
+++ b/sys/pci/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) {
diff --git a/sys/pci/ncr.c b/sys/pci/ncr.c
index c30e922..fd5d9c0 100644
--- a/sys/pci/ncr.c
+++ b/sys/pci/ncr.c
@@ -6533,13 +6533,13 @@ ncr_alloc_nccb (ncb_p np, u_long target, u_long lun)
/*
** Allocate a lcb
*/
- lp = (lcb_p) malloc (sizeof (struct lcb), M_DEVBUF, M_NOWAIT);
+ lp = (lcb_p) malloc (sizeof (struct lcb), M_DEVBUF,
+ M_NOWAIT | M_ZERO);
if (!lp) return(NULL);
/*
** Initialize it
*/
- bzero (lp, sizeof (*lp));
lp->jump_lcb.l_cmd = (SCR_JUMP ^ IFFALSE (DATA (lun)));
lp->jump_lcb.l_paddr = tp->jump_lcb.l_paddr;
@@ -6562,7 +6562,7 @@ ncr_alloc_nccb (ncb_p np, u_long target, u_long lun)
/*
** Allocate a nccb
*/
- cp = (nccb_p) malloc (sizeof (struct nccb), M_DEVBUF, M_NOWAIT);
+ cp = (nccb_p) malloc (sizeof (struct nccb), M_DEVBUF, M_NOWAIT|M_ZERO);
if (!cp)
return (NULL);
@@ -6572,11 +6572,6 @@ ncr_alloc_nccb (ncb_p np, u_long target, u_long lun)
}
/*
- ** Initialize it
- */
- bzero (cp, sizeof (*cp));
-
- /*
** Fill in physical addresses
*/
diff --git a/sys/pci/pci.c b/sys/pci/pci.c
index 2e5b9c5..c87e8e4 100644
--- a/sys/pci/pci.c
+++ b/sys/pci/pci.c
@@ -185,12 +185,10 @@ pci_readppb(device_t pcib, int b, int s, int f)
{
pcih1cfgregs *p;
- p = malloc(sizeof (pcih1cfgregs), M_DEVBUF, M_WAITOK);
+ p = malloc(sizeof (pcih1cfgregs), M_DEVBUF, M_WAITOK | M_ZERO);
if (p == NULL)
return (NULL);
- bzero(p, sizeof *p);
-
p->secstat = PCIB_READ_CONFIG(pcib, b, s, f, PCIR_SECSTAT_1, 2);
p->bridgectl = PCIB_READ_CONFIG(pcib, b, s, f, PCIR_BRIDGECTL_1, 2);
@@ -231,12 +229,10 @@ pci_readpcb(device_t pcib, int b, int s, int f)
{
pcih2cfgregs *p;
- p = malloc(sizeof (pcih2cfgregs), M_DEVBUF, M_WAITOK);
+ p = malloc(sizeof (pcih2cfgregs), M_DEVBUF, M_WAITOK | M_ZERO);
if (p == NULL)
return (NULL);
- bzero(p, sizeof *p);
-
p->secstat = PCIB_READ_CONFIG(pcib, b, s, f, PCIR_SECSTAT_2, 2);
p->bridgectl = PCIB_READ_CONFIG(pcib, b, s, f, PCIR_BRIDGECTL_2, 2);
@@ -304,10 +300,9 @@ pci_read_device(device_t pcib, int b, int s, int f)
if (PCIB_READ_CONFIG(pcib, b, s, f, PCIR_DEVVENDOR, 4) != -1) {
devlist_entry = malloc(sizeof(struct pci_devinfo),
- M_DEVBUF, M_WAITOK);
+ M_DEVBUF, M_WAITOK | M_ZERO);
if (devlist_entry == NULL)
return (NULL);
- bzero(devlist_entry, sizeof *devlist_entry);
cfg = &devlist_entry->cfg;
diff --git a/sys/pci/pci_compat.c b/sys/pci/pci_compat.c
index 447fc58..401680d 100644
--- a/sys/pci/pci_compat.c
+++ b/sys/pci/pci_compat.c
@@ -317,10 +317,9 @@ compat_pci_handler(module_t mod, int type, void *data)
switch (type) {
case MOD_LOAD:
- driver = malloc(sizeof(driver_t), M_DEVBUF, M_NOWAIT);
+ driver = malloc(sizeof(driver_t), M_DEVBUF, M_NOWAIT | M_ZERO);
if (!driver)
return ENOMEM;
- bzero(driver, sizeof(driver_t));
driver->name = dvp->pd_name;
driver->methods = pci_compat_methods;
driver->size = sizeof(struct pci_devinfo *);
diff --git a/sys/pci/simos.c b/sys/pci/simos.c
index 413f7d7..bf12f5a 100644
--- a/sys/pci/simos.c
+++ b/sys/pci/simos.c
@@ -107,9 +107,8 @@ simos_attach(pcici_t config_id, int unit)
struct simos_softc* sc;
struct cam_devq *devq;
- sc = malloc(sizeof(struct simos_softc), M_DEVBUF, M_WAITOK);
+ sc = malloc(sizeof(struct simos_softc), M_DEVBUF, M_WAITOK | M_ZERO);
simosp[unit] = sc;
- bzero(sc, sizeof *sc);
sc->sc_unit = unit;
sc->sc_regs = (SimOS_SCSI*) SIMOS_SCSI_ADDR;
OpenPOWER on IntegriCloud