system/freebsd-src
system/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src synced 2024-10-01 14:14:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

hidbus: Use device_set_descf()

Browse source 
No functional change intended.

MFC after:	1 week
This commit is contained in:
Mark Johnston 2024-06-05 15:25:05 -04:00
parent 9da1b6dc16
commit 3f795763e4
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sys/dev/hid/hidbus.c
View file

@ -525,14 +525,12 @@ hidbus_set_desc(device_t child, const char *suffix)
struct hidbus_softc *sc = device_get_softc(bus);
struct hid_device_info *devinfo = device_get_ivars(bus);
struct hidbus_ivars *tlc = device_get_ivars(child);
char buf[80];
/* Do not add NULL suffix or if device name already contains it. */
if (suffix != NULL && strcasestr(devinfo->name, suffix) == NULL &&
(sc->nauto > 1 || (tlc->flags & HIDBUS_FLAG_AUTOCHILD) == 0)) {
snprintf(buf, sizeof(buf), "%s %s", devinfo->name, suffix);
device_set_desc_copy(child, buf);
} else
(sc->nauto > 1 || (tlc->flags & HIDBUS_FLAG_AUTOCHILD) == 0))
device_set_descf(child, "%s %s", devinfo->name, suffix);
else
device_set_desc(child, devinfo->name);
}