system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-07-22 02:37:15 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

bhnd: Use device_set_descf()

Browse source 
Here we are in a device probe routine with no locks held.  M_WAITOK
allocations are ok.  No functional change intended.

MFC after:	1 week
This commit is contained in:
Mark Johnston 2024-02-04 18:35:02 -05:00
parent 25b839dfd2
commit a866a40b9b
2 changed files with 3 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sys/dev/bhnd/bhnd_subr.c
View file

@ -1765,18 +1765,10 @@ void
bhnd_set_custom_core_desc(device_t dev, const char *dev_name) bhnd_set_custom_core_desc(device_t dev, const char *dev_name)
{ {
const char *vendor_name; const char *vendor_name;
char *desc;
vendor_name = bhnd_get_vendor_name(dev); 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)); 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) bhnd_set_default_bus_desc(device_t dev, const struct bhnd_chipid *chip_id)
{ {
const char *bus_name; const char *bus_name;
char *desc;
char chip_name[BHND_CHIPID_MAX_NAMELEN]; char chip_name[BHND_CHIPID_MAX_NAMELEN];
/* Determine chip type's bus name */ /* 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); chip_id->chip_id);
/* Format and set device description */ /* Format and set device description */
asprintf(&desc, M_BHND, "%s %s", chip_name, bus_name); device_set_descf(dev, "%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);
}
} }
/** /**

4
sys/dev/bhnd/cores/chipc/bhnd_pmu_chipc.c
View file

@ -62,7 +62,6 @@ bhnd_pmu_chipc_probe(device_t dev)
struct chipc_caps *ccaps; struct chipc_caps *ccaps;
struct chipc_softc *chipc_sc; struct chipc_softc *chipc_sc;
device_t chipc; device_t chipc;
char desc[34];
int error; int error;
uint32_t pcaps; uint32_t pcaps;
uint8_t rev; uint8_t rev;
@ -87,8 +86,7 @@ bhnd_pmu_chipc_probe(device_t dev)
/* Set description */ /* Set description */
rev = BHND_PMU_GET_BITS(pcaps, BHND_PMU_CAP_REV); rev = BHND_PMU_GET_BITS(pcaps, BHND_PMU_CAP_REV);
snprintf(desc, sizeof(desc), "Broadcom ChipCommon PMU, rev %hhu", rev); device_set_descf(dev, "Broadcom ChipCommon PMU, rev %hhu", rev);
device_set_desc_copy(dev, desc);
return (BUS_PROBE_NOWILDCARD); return (BUS_PROBE_NOWILDCARD);
} }