summaryrefslogtreecommitdiffstats
path: root/sys/i386/isa/stallion.c
diff options
context:
space:
mode:
authordwmalone <dwmalone@FreeBSD.org>2000-12-08 21:51:06 +0000
committerdwmalone <dwmalone@FreeBSD.org>2000-12-08 21:51:06 +0000
commitdd75d1d73b4f3034c1d9f621a49fff58b1d71eb1 (patch)
tree197ae73617ae75afe008897f6906b84835589ea2 /sys/i386/isa/stallion.c
parented5dbfbd3cd619638a7baac288f548aa1398edac (diff)
downloadFreeBSD-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/i386/isa/stallion.c')
-rw-r--r--sys/i386/isa/stallion.c16
1 files changed, 6 insertions, 10 deletions
diff --git a/sys/i386/isa/stallion.c b/sys/i386/isa/stallion.c
index 8162a45..07528a0 100644
--- a/sys/i386/isa/stallion.c
+++ b/sys/i386/isa/stallion.c
@@ -635,13 +635,12 @@ static int stlattach(struct isa_device *idp)
idp->id_ointr = stlintr;
- brdp = (stlbrd_t *) malloc(sizeof(stlbrd_t), M_TTYS, M_NOWAIT);
+ brdp = (stlbrd_t *) malloc(sizeof(stlbrd_t), M_TTYS, M_NOWAIT | M_ZERO);
if (brdp == (stlbrd_t *) NULL) {
printf("STALLION: failed to allocate memory (size=%d)\n",
sizeof(stlbrd_t));
return(0);
}
- bzero(brdp, sizeof(stlbrd_t));
if ((brdp->brdnr = stl_findfreeunit()) < 0) {
printf("STALLION: too many boards found, max=%d\n",
@@ -707,13 +706,12 @@ void stlpciattach(pcici_t tag, int unit)
printf("stlpciattach(tag=%x,unit=%x)\n", (int) &tag, unit);
#endif
- brdp = (stlbrd_t *) malloc(sizeof(stlbrd_t), M_TTYS, M_NOWAIT);
+ brdp = (stlbrd_t *) malloc(sizeof(stlbrd_t), M_TTYS, M_NOWAIT | M_ZERO);
if (brdp == (stlbrd_t *) NULL) {
printf("STALLION: failed to allocate memory (size=%d)\n",
sizeof(stlbrd_t));
return;
}
- bzero(brdp, sizeof(stlbrd_t));
if ((unit < 0) || (unit > STL_MAXBRDS)) {
printf("STALLION: bad PCI board unit number=%d\n", unit);
@@ -2596,13 +2594,12 @@ static int stl_initports(stlbrd_t *brdp, stlpanel_t *panelp)
if ((chipmask & (0x1 << (i / 4))) == 0)
continue;
portp = (stlport_t *) malloc(sizeof(stlport_t), M_TTYS,
- M_NOWAIT);
+ M_NOWAIT | M_ZERO);
if (portp == (stlport_t *) NULL) {
printf("STALLION: failed to allocate port memory "
"(size=%d)\n", sizeof(stlport_t));
break;
}
- bzero(portp, sizeof(stlport_t));
portp->portnr = i;
portp->brdnr = panelp->brdnr;
@@ -2701,13 +2698,13 @@ static int stl_initeio(stlbrd_t *brdp)
outb(brdp->ioctrl, (stl_vecmap[brdp->irq] |
((brdp->irqtype) ? EIO_INTLEVEL : EIO_INTEDGE)));
- panelp = (stlpanel_t *) malloc(sizeof(stlpanel_t), M_TTYS, M_NOWAIT);
+ panelp = (stlpanel_t *) malloc(sizeof(stlpanel_t), M_TTYS,
+ M_NOWAIT | M_ZERO);
if (panelp == (stlpanel_t *) NULL) {
printf("STALLION: failed to allocate memory (size=%d)\n",
sizeof(stlpanel_t));
return(ENOMEM);
}
- bzero(panelp, sizeof(stlpanel_t));
panelp->brdnr = brdp->brdnr;
panelp->panelnr = 0;
@@ -2803,13 +2800,12 @@ static int stl_initech(stlbrd_t *brdp)
if ((status & ECH_PNLIDMASK) != nxtid)
break;
panelp = (stlpanel_t *) malloc(sizeof(stlpanel_t), M_TTYS,
- M_NOWAIT);
+ M_NOWAIT | M_ZERO);
if (panelp == (stlpanel_t *) NULL) {
printf("STALLION: failed to allocate memory"
"(size=%d)\n", sizeof(stlpanel_t));
break;
}
- bzero(panelp, sizeof(stlpanel_t));
panelp->brdnr = brdp->brdnr;
panelp->panelnr = panelnr;
panelp->iobase = ioaddr;
OpenPOWER on IntegriCloud