From: Niranjan H Y <niranjan.hy@ti.com>
To: <linux-sound@vger.kernel.org>
Cc: <linux-kernel@vger.kernel.org>, <broonie@kernel.org>,
<ckeepax@opensource.cirrus.com>, <lgirdwood@gmail.com>,
<perex@perex.cz>, <tiwai@suse.com>, <cezary.rojewski@intel.com>,
<peter.ujfalusi@linux.intel.com>,
<yung-chuan.liao@linux.intel.com>, <kai.vehmanen@linux.intel.com>,
<pierre-louis.bossart@linux.dev>, <baojun.xu@ti.com>,
<shenghao-ding@ti.com>, <sandeepk@ti.com>, <v-hampiholi@ti.com>,
Niranjan H Y <niranjan.hy@ti.com>,
Dan Carpenter <error27@gmail.com>
Subject: [PATCH v2] ASoC: sdw_utils: Remove dead code in asoc_sdw_ti_add_tac5xx2_routes()
Date: Wed, 13 May 2026 07:25:42 +0530 [thread overview]
Message-ID: <20260513015542.2420-1-niranjan.hy@ti.com> (raw)
Remove unnecessary checks for scnprintf() return values in
asoc_sdw_ti_add_tac5xx2_routes(). The function scnprintf() never
returns negative values and cannot return zero given the format
strings used ("%s SPK_L" and "%s SPK_R").
The existing length validation at line 110 already ensures that
name_prefix won't cause buffer overflow, and scnprintf() guarantees
null-termination even in case of truncation.
Fixes: e812de61e9a0 ("ASoC: sdw_utils: TI amp utility for tac5xx2 family")
Reported-by: Dan Carpenter <error27@gmail.com>
Closes: https://lore.kernel.org/linux-sound/agF8GBcHYUaGJbXY@stanley.mountain/
Signed-off-by: Niranjan H Y <niranjan.hy@ti.com>
---
Changes in v2:
- update Reported-by with correct email id.
---
sound/soc/sdw_utils/soc_sdw_ti_amp.c | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/sound/soc/sdw_utils/soc_sdw_ti_amp.c b/sound/soc/sdw_utils/soc_sdw_ti_amp.c
index f156116fbeb..d0ae5d7efe8 100644
--- a/sound/soc/sdw_utils/soc_sdw_ti_amp.c
+++ b/sound/soc/sdw_utils/soc_sdw_ti_amp.c
@@ -105,18 +105,12 @@ static int asoc_sdw_ti_add_tac5xx2_routes(struct snd_soc_dapm_context *dapm,
struct snd_soc_dapm_route routes[2];
char left_widget[TAC5XX2_WIDGET_NAME_MAX];
char right_widget[TAC5XX2_WIDGET_NAME_MAX];
- int ret;
if (strlen(name_prefix) > (TAC5XX2_WIDGET_NAME_MAX - 7))
return -ENAMETOOLONG;
- ret = scnprintf(left_widget, sizeof(left_widget), "%s SPK_L", name_prefix);
- if (ret <= 0)
- return -EINVAL;
-
- ret = scnprintf(right_widget, sizeof(right_widget), "%s SPK_R", name_prefix);
- if (ret <= 0)
- return -EINVAL;
+ scnprintf(left_widget, sizeof(left_widget), "%s SPK_L", name_prefix);
+ scnprintf(right_widget, sizeof(right_widget), "%s SPK_R", name_prefix);
routes[0] = (struct snd_soc_dapm_route){"Left Spk", NULL, left_widget};
routes[1] = (struct snd_soc_dapm_route){"Right Spk", NULL, right_widget};
--
2.34.1
reply other threads:[~2026-05-13 1:56 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260513015542.2420-1-niranjan.hy@ti.com \
--to=niranjan.hy@ti.com \
--cc=baojun.xu@ti.com \
--cc=broonie@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=ckeepax@opensource.cirrus.com \
--cc=error27@gmail.com \
--cc=kai.vehmanen@linux.intel.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=perex@perex.cz \
--cc=peter.ujfalusi@linux.intel.com \
--cc=pierre-louis.bossart@linux.dev \
--cc=sandeepk@ti.com \
--cc=shenghao-ding@ti.com \
--cc=tiwai@suse.com \
--cc=v-hampiholi@ti.com \
--cc=yung-chuan.liao@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox