From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: tiwai@suse.de,
Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>,
Daniel Baluta <daniel.baluta@gmail.com>,
broonie@kernel.org,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Subject: [PATCH 3/5] ASoC: soc-core: fix always-false condition
Date: Fri, 16 Apr 2021 14:11:42 -0500 [thread overview]
Message-ID: <20210416191144.27006-4-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20210416191144.27006-1-pierre-louis.bossart@linux.intel.com>
cppcheck warning:
sound/soc/soc-core.c:2784:6: style: Condition '!num_routes' is always
false [knownConditionTrueFalse]
if (!num_routes) {
^
sound/soc/soc-core.c:2777:17: note: Assuming that condition
'num_routes<0' is not redundant
if (num_routes < 0 || num_routes & 1) {
^
sound/soc/soc-core.c:2783:2: note: Compound assignment '/=', assigned
value is 0
num_routes /= 2;
^
sound/soc/soc-core.c:2784:6: note: Condition '!num_routes' is always
false
if (!num_routes) {
^
The documentation for of_property_count_string reads
"
* Returns the number of strings on
* success, -EINVAL if the property does not exist, -ENODATA if property
* does not have a value, and -EILSEQ if the string is not null-terminated
* within the length of the property data.
"
Since the case for num_routes == 0 is not possible, let's remove this
test.
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Reviewed-by: Daniel Baluta <daniel.baluta@gmail.com>
Reviewed-by: Guennadi Liakhovetski <guennadi.liakhovetski@linux.intel.com>
---
sound/soc/soc-core.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index aee91bde9fb8..3a4ae52e5280 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -2781,11 +2781,6 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
return -EINVAL;
}
num_routes /= 2;
- if (!num_routes) {
- dev_err(card->dev, "ASoC: Property '%s's length is zero\n",
- propname);
- return -EINVAL;
- }
routes = devm_kcalloc(card->dev, num_routes, sizeof(*routes),
GFP_KERNEL);
--
2.25.1
next prev parent reply other threads:[~2021-04-16 19:14 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-16 19:11 [PATCH 0/5] ASoC: remove more cppcheck warnings Pierre-Louis Bossart
2021-04-16 19:11 ` [PATCH 1/5] ASoC: soc-acpi: remove useless initialization Pierre-Louis Bossart
2021-04-16 19:11 ` [PATCH 2/5] ASoC: soc-core: fix signed/unsigned issue Pierre-Louis Bossart
2021-04-16 19:11 ` Pierre-Louis Bossart [this message]
2021-04-16 19:11 ` [PATCH 4/5] ASoC: codecs: lpass-rx-macro: remove useless return Pierre-Louis Bossart
2021-04-16 19:11 ` [PATCH 5/5] ASoC: codecs: rt5682: clarify expression Pierre-Louis Bossart
2021-04-19 17:33 ` [PATCH 0/5] ASoC: remove more cppcheck warnings Mark Brown
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=20210416191144.27006-4-pierre-louis.bossart@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=daniel.baluta@gmail.com \
--cc=guennadi.liakhovetski@linux.intel.com \
--cc=tiwai@suse.de \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.