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/isa | |
| 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/isa')
| -rw-r--r-- | sys/isa/atkbdc_isa.c | 4 | ||||
| -rw-r--r-- | sys/isa/fd.c | 3 | ||||
| -rw-r--r-- | sys/isa/isa_common.c | 3 | ||||
| -rw-r--r-- | sys/isa/pnpparse.c | 3 |
4 files changed, 5 insertions, 8 deletions
diff --git a/sys/isa/atkbdc_isa.c b/sys/isa/atkbdc_isa.c index e8c3e4c..d99b648 100644 --- a/sys/isa/atkbdc_isa.c +++ b/sys/isa/atkbdc_isa.c @@ -146,10 +146,10 @@ atkbdc_add_device(device_t dev, const char *name, int unit) if (resource_int_value(name, unit, "disabled", &t) == 0 && t != 0) return; - kdev = malloc(sizeof(struct atkbdc_device), M_ATKBDDEV, M_NOWAIT); + kdev = malloc(sizeof(struct atkbdc_device), M_ATKBDDEV, + M_NOWAIT | M_ZERO); if (!kdev) return; - bzero(kdev, sizeof *kdev); if (resource_int_value(name, unit, "irq", &t) == 0) kdev->irq = t; diff --git a/sys/isa/fd.c b/sys/isa/fd.c index e82bbd5..4fee4f5 100644 --- a/sys/isa/fd.c +++ b/sys/isa/fd.c @@ -818,10 +818,9 @@ fdc_add_child(device_t dev, const char *name, int unit) struct fdc_ivars *ivar; device_t child; - ivar = malloc(sizeof *ivar, M_DEVBUF /* XXX */, M_NOWAIT); + ivar = malloc(sizeof *ivar, M_DEVBUF /* XXX */, M_NOWAIT | M_ZERO); if (ivar == NULL) return; - bzero(ivar, sizeof *ivar); if (resource_int_value(name, unit, "drive", &ivar->fdunit) != 0) ivar->fdunit = 0; child = device_add_child(dev, name, unit); diff --git a/sys/isa/isa_common.c b/sys/isa/isa_common.c index 4334ddf..9a761cf 100644 --- a/sys/isa/isa_common.c +++ b/sys/isa/isa_common.c @@ -522,10 +522,9 @@ isa_add_child(device_t dev, int order, const char *name, int unit) device_t child; struct isa_device *idev; - idev = malloc(sizeof(struct isa_device), M_ISADEV, M_NOWAIT); + idev = malloc(sizeof(struct isa_device), M_ISADEV, M_NOWAIT | M_ZERO); if (!idev) return 0; - bzero(idev, sizeof *idev); resource_list_init(&idev->id_resources); TAILQ_INIT(&idev->id_configs); diff --git a/sys/isa/pnpparse.c b/sys/isa/pnpparse.c index 8c66716..976b0eb 100644 --- a/sys/isa/pnpparse.c +++ b/sys/isa/pnpparse.c @@ -62,12 +62,11 @@ pnp_parse_resources(device_t dev, u_char *resources, int len, u_int32_t vendor_i id = isa_get_logicalid(dev); configs = (struct isa_config *)malloc(sizeof(*configs) * (1 + MAXDEP), - M_DEVBUF, M_NOWAIT); + M_DEVBUF, M_NOWAIT | M_ZERO); if (configs == NULL) { device_printf(dev, "No memory to parse PNP data\n"); return; } - bzero(configs, sizeof(*configs) * (1 + MAXDEP)); config = &configs[0]; priorities[0] = 0; resp = resources; |
