diff options
Diffstat (limited to 'sys/dev/bhnd/bhnd_subr.c')
| -rw-r--r-- | sys/dev/bhnd/bhnd_subr.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/sys/dev/bhnd/bhnd_subr.c b/sys/dev/bhnd/bhnd_subr.c index 0d38c1ca8a24..4818fffd5659 100644 --- a/sys/dev/bhnd/bhnd_subr.c +++ b/sys/dev/bhnd/bhnd_subr.c @@ -1765,18 +1765,10 @@ void bhnd_set_custom_core_desc(device_t dev, const char *dev_name) { const char *vendor_name; - char *desc; vendor_name = bhnd_get_vendor_name(dev); - asprintf(&desc, M_BHND, "%s %s, rev %hhu", vendor_name, dev_name, + device_set_descf(dev, "%s %s, rev %hhu", vendor_name, dev_name, bhnd_get_hwrev(dev)); - - if (desc != NULL) { - device_set_desc_copy(dev, desc); - free(desc, M_BHND); - } else { - device_set_desc(dev, dev_name); - } } /** @@ -1802,7 +1794,6 @@ void bhnd_set_default_bus_desc(device_t dev, const struct bhnd_chipid *chip_id) { const char *bus_name; - char *desc; char chip_name[BHND_CHIPID_MAX_NAMELEN]; /* Determine chip type's bus name */ @@ -1827,14 +1818,7 @@ bhnd_set_default_bus_desc(device_t dev, const struct bhnd_chipid *chip_id) chip_id->chip_id); /* Format and set device description */ - asprintf(&desc, M_BHND, "%s %s", chip_name, bus_name); - if (desc != NULL) { - device_set_desc_copy(dev, desc); - free(desc, M_BHND); - } else { - device_set_desc(dev, bus_name); - } - + device_set_descf(dev, "%s %s", chip_name, bus_name); } /** @@ -2186,7 +2170,7 @@ bhnd_bus_generic_get_nvram_var(device_t dev, device_t child, const char *name, bus_topo_assert(); /* Look for a directly-attached NVRAM child */ - if ((nvram = device_find_child(dev, "bhnd_nvram", -1)) != NULL) + if ((nvram = device_find_child(dev, "bhnd_nvram", DEVICE_UNIT_ANY)) != NULL) return BHND_NVRAM_GETVAR(nvram, name, buf, size, type); /* Try to delegate to parent */ |