sound/usb/mixer.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
Simplified code by removing redundant assignment of sprintf return value
Signed-off-by: Zhu Jun <zhujun2@cmss.chinamobile.com>
---
sound/usb/mixer.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index 9945ae55b0d0..dea6cbd65667 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -2224,7 +2224,8 @@ static void build_mixer_unit_ctl(struct mixer_build *state,
len = get_term_name(state->chip, iterm, kctl->id.name,
sizeof(kctl->id.name), 0);
if (!len)
- len = sprintf(kctl->id.name, "Mixer Source %d", in_ch + 1);
+ sprintf(kctl->id.name, "Mixer Source %d", in_ch + 1);
+
append_ctl_name(kctl, " Volume");
usb_audio_dbg(state->chip, "[%d] MU [%s] ch = %d, val = %d/%d\n",
--
2.17.1
Le 08/10/2024 à 05:30, Zhu Jun a écrit : > Simplified code by removing redundant assignment of sprintf return value > > Signed-off-by: Zhu Jun <zhujun2@cmss.chinamobile.com> > --- > sound/usb/mixer.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c > index 9945ae55b0d0..dea6cbd65667 100644 > --- a/sound/usb/mixer.c > +++ b/sound/usb/mixer.c > @@ -2224,7 +2224,8 @@ static void build_mixer_unit_ctl(struct mixer_build *state, > len = get_term_name(state->chip, iterm, kctl->id.name, > sizeof(kctl->id.name), 0); > if (!len) > - len = sprintf(kctl->id.name, "Mixer Source %d", in_ch + 1); > + sprintf(kctl->id.name, "Mixer Source %d", in_ch + 1); > + > append_ctl_name(kctl, " Volume"); > > usb_audio_dbg(state->chip, "[%d] MU [%s] ch = %d, val = %d/%d\n", Hi, even if not needed, using snprintf() with the same sizeof() as in append_ctl_name() would be nice, IMHO. CJ
© 2016 - 2026 Red Hat, Inc.