diff options
| author | imp <imp@FreeBSD.org> | 2010-11-30 05:54:21 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2010-11-30 05:54:21 +0000 |
| commit | edeca9302ca716fcef451ad56b7b3003188e47ba (patch) | |
| tree | c35c5da814fce219dc803444b62482349ea790d0 /sys/kern/subr_bus.c | |
| parent | fa03bd07dd237b7b1594ef4af51fe5e17a65ce53 (diff) | |
| download | FreeBSD-src-edeca9302ca716fcef451ad56b7b3003188e47ba.zip FreeBSD-src-edeca9302ca716fcef451ad56b7b3003188e47ba.tar.gz | |
Remove redundant (and bogus) insertion of pnp info when announcing new
and retiring devices. That's already inserted elsewhere.
Submitted by: n_hibma
MFC after: 3 days
Diffstat (limited to 'sys/kern/subr_bus.c')
| -rw-r--r-- | sys/kern/subr_bus.c | 39 |
1 files changed, 2 insertions, 37 deletions
diff --git a/sys/kern/subr_bus.c b/sys/kern/subr_bus.c index 5a53fc9..ac3a88e 100644 --- a/sys/kern/subr_bus.c +++ b/sys/kern/subr_bus.c @@ -708,25 +708,7 @@ bad: static void devadded(device_t dev) { - char *pnp = NULL; - char *tmp = NULL; - - pnp = malloc(1024, M_BUS, M_NOWAIT); - if (pnp == NULL) - goto fail; - tmp = malloc(1024, M_BUS, M_NOWAIT); - if (tmp == NULL) - goto fail; - *pnp = '\0'; - bus_child_pnpinfo_str(dev, pnp, 1024); - snprintf(tmp, 1024, "%s %s", device_get_nameunit(dev), pnp); - devaddq("+", tmp, dev); -fail: - if (pnp != NULL) - free(pnp, M_BUS); - if (tmp != NULL) - free(tmp, M_BUS); - return; + devaddq("+", device_get_nameunit(dev), dev); } /* @@ -736,24 +718,7 @@ fail: static void devremoved(device_t dev) { - char *pnp = NULL; - char *tmp = NULL; - - pnp = malloc(1024, M_BUS, M_NOWAIT); - if (pnp == NULL) - goto fail; - tmp = malloc(1024, M_BUS, M_NOWAIT); - if (tmp == NULL) - goto fail; - *pnp = '\0'; - bus_child_pnpinfo_str(dev, pnp, 1024); - snprintf(tmp, 1024, "%s %s", device_get_nameunit(dev), pnp); - devaddq("-", tmp, dev); -fail: - if (pnp != NULL) - free(pnp, M_BUS); - if (tmp != NULL) - free(tmp, M_BUS); + devaddq("+", device_get_nameunit(dev), dev); return; } |
