github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-07 06:17:02 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

ALSA: usb-audio: Simplify usb_audio_make_longname()

Browse Source 
To prepare for removing strlcat() from the kernel [1], track the output
length and replace strlcat() with scnprintf() and strscpy().

Replace the speed switch statement with a lookup table.

No functional change.

Link: https://github.com/KSPP/linux/issues/370 [1]
Signed-off-by: Thorsten Blum <blum@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20261018124155.2081-4-blum@kernel.org
This commit is contained in:
Thorsten Blum 2026-10-18 14:41:55 +02:00 committed by Takashi Iwai
parent 4c0d77c469
commit e45d0fad00
1 changed files with 27 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
sound/usb/card.c
View File

@ -642,63 +642,46 @@ static void usb_audio_make_longname(struct usb_device *dev,
struct snd_usb_audio *chip,
const struct snd_usb_audio_quirk *quirk)
{
static const char * const speed_suffixes[] = {
[USB_SPEED_LOW] = ", low speed",
[USB_SPEED_FULL] = ", full speed",
[USB_SPEED_HIGH] = ", high speed",
[USB_SPEED_SUPER] = ", super speed",
[USB_SPEED_SUPER_PLUS] = ", super speed plus",
};
struct snd_card *card = chip->card;
const struct usb_audio_device_name *preset;
const char *s = NULL;
int len;
enum usb_device_speed speed = snd_usb_get_speed(dev);
int len, ret;
preset = lookup_device_name(chip->usb_id);
/* shortcut - if any pre-defined string is given, use it */
if (preset && preset->profile_name)
s = preset->profile_name;
if (s && *s) {
strscpy(card->longname, s, sizeof(card->longname));
if (preset && preset->profile_name && *preset->profile_name) {
strscpy(card->longname, preset->profile_name);
return;
}
if (preset && preset->vendor_name)
s = preset->vendor_name;
else if (quirk && quirk->vendor_name)
s = quirk->vendor_name;
*card->longname = 0;
if (s && *s)
strscpy(card->longname, s);
else if (dev->manufacturer && *dev->manufacturer)
strscpy(card->longname, dev->manufacturer);
if (preset && preset->vendor_name)
strscpy(card->longname, preset->vendor_name);
else if (quirk && quirk->vendor_name)
strscpy(card->longname, quirk->vendor_name);
if (!*card->longname)
strscpy(card->longname, dev->manufacturer ?: "");
if (*card->longname) {
strim(card->longname);
if (*card->longname)
strlcat(card->longname, " ", sizeof(card->longname));
}
strim(card->longname);
len = strlen(card->longname);
len += scnprintf(card->longname + len, sizeof(card->longname) - len,
"%s%s at ", len ? " " : "", card->shortname);
strlcat(card->longname, card->shortname, sizeof(card->longname));
ret = usb_make_path(dev, card->longname + len, sizeof(card->longname) - len);
if (ret < 0)
return;
len += ret;
len = strlcat(card->longname, " at ", sizeof(card->longname));
if (len < sizeof(card->longname))
usb_make_path(dev, card->longname + len, sizeof(card->longname) - len);
switch (snd_usb_get_speed(dev)) {
case USB_SPEED_LOW:
strlcat(card->longname, ", low speed", sizeof(card->longname));
break;
case USB_SPEED_FULL:
strlcat(card->longname, ", full speed", sizeof(card->longname));
break;
case USB_SPEED_HIGH:
strlcat(card->longname, ", high speed", sizeof(card->longname));
break;
case USB_SPEED_SUPER:
strlcat(card->longname, ", super speed", sizeof(card->longname));
break;
case USB_SPEED_SUPER_PLUS:
strlcat(card->longname, ", super speed plus", sizeof(card->longname));
break;
default:
break;
}
if (speed < ARRAY_SIZE(speed_suffixes) && speed_suffixes[speed])
strscpy(card->longname + len, speed_suffixes[speed], sizeof(card->longname) - len);
}
static void snd_usb_init_quirk_flags(int idx, struct snd_usb_audio *chip)