From: Herve Codina <herve.codina@bootlin.com>
To: Herve Codina <herve.codina@bootlin.com>,
Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Rob Herring <robh+dt@kernel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@linaro.org>,
Conor Dooley <conor+dt@kernel.org>,
Jonathan Cameron <jic23@kernel.org>,
Lars-Peter Clausen <lars@metafoo.de>,
Jaroslav Kysela <perex@perex.cz>, Takashi Iwai <tiwai@suse.com>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
Andy Shevchenko <andy.shevchenko@gmail.com>
Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org,
linux-kernel@vger.kernel.org, linux-iio@vger.kernel.org,
Christophe Leroy <christophe.leroy@csgroup.eu>,
Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Subject: [PATCH v4 05/13] iio: inkern: Remove the 'unused' variable usage in iio_channel_read_max()
Date: Wed, 14 Jun 2023 09:48:56 +0200 [thread overview]
Message-ID: <20230614074904.29085-6-herve.codina@bootlin.com> (raw)
In-Reply-To: <20230614074904.29085-1-herve.codina@bootlin.com>
The code uses a local variable to initialize a null pointer in order to
avoid accessing this null pointer later on.
Simply removed the 'unused' variable and check for the null pointer just
before accessing it.
Signed-off-by: Herve Codina <herve.codina@bootlin.com>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
---
drivers/iio/inkern.c | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/iio/inkern.c b/drivers/iio/inkern.c
index f738db9a0c04..ce537b4ca6ca 100644
--- a/drivers/iio/inkern.c
+++ b/drivers/iio/inkern.c
@@ -849,14 +849,10 @@ static int iio_channel_read_max(struct iio_channel *chan,
int *val, int *val2, int *type,
enum iio_chan_info_enum info)
{
- int unused;
const int *vals;
int length;
int ret;
- if (!val2)
- val2 = &unused;
-
ret = iio_channel_read_avail(chan, &vals, type, &length, info);
if (ret < 0)
return ret;
@@ -869,7 +865,8 @@ static int iio_channel_read_max(struct iio_channel *chan,
break;
default:
*val = vals[4];
- *val2 = vals[5];
+ if (val2)
+ *val2 = vals[5];
}
return 0;
--
2.40.1
next prev parent reply other threads:[~2023-06-14 7:50 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-06-14 7:48 [PATCH v4 00/13] Add support for IIO devices in ASoC Herve Codina
2023-06-14 7:48 ` [PATCH v4 01/13] ASoC: dt-bindings: Add audio-iio-aux Herve Codina
2023-06-14 7:48 ` [PATCH v4 02/13] ASoC: dt-bindings: simple-card: Add additional-devs subnode Herve Codina
2023-06-14 7:48 ` [PATCH v4 03/13] iio: inkern: Check error explicitly in iio_channel_read_max() Herve Codina
2023-06-14 7:48 ` [PATCH v4 04/13] iio: consumer.h: Fix raw values documentation notes Herve Codina
2023-06-14 7:48 ` Herve Codina [this message]
2023-06-14 7:48 ` [PATCH v4 06/13] iio: inkern: Fix headers inclusion order Herve Codina
2023-06-14 8:58 ` Andy Shevchenko
2023-06-14 7:48 ` [PATCH v4 07/13] minmax: Introduce {min,max}_array() Herve Codina
2023-06-14 9:02 ` Andy Shevchenko
2023-06-14 9:42 ` Herve Codina
2023-06-14 11:51 ` Andy Shevchenko
2023-06-14 20:34 ` Herve Codina
2023-06-14 22:05 ` Andy Shevchenko
2023-06-15 9:35 ` Herve Codina
2023-06-15 13:51 ` Andy Shevchenko
2023-06-16 9:08 ` David Laight
2023-06-16 11:48 ` Herve Codina
2023-06-16 12:42 ` David Laight
2023-06-14 7:48 ` [PATCH v4 08/13] iio: inkern: Use max_array() to get the maximum value from an array Herve Codina
2023-06-14 9:03 ` Andy Shevchenko
2023-06-14 7:49 ` [PATCH v4 09/13] iio: inkern: Replace a FIXME comment by a TODO one Herve Codina
2023-06-14 7:49 ` [PATCH v4 10/13] iio: inkern: Add a helper to query an available minimum raw value Herve Codina
2023-06-14 7:49 ` [PATCH v4 11/13] ASoC: soc-dapm.h: Convert macros to return a compound literal Herve Codina
2023-06-14 7:49 ` [PATCH v4 12/13] ASoC: codecs: Add support for the generic IIO auxiliary devices Herve Codina
2023-06-14 7:49 ` [PATCH v4 13/13] ASoC: simple-card: Handle additional devices Herve Codina
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=20230614074904.29085-6-herve.codina@bootlin.com \
--to=herve.codina@bootlin.com \
--cc=alsa-devel@alsa-project.org \
--cc=andy.shevchenko@gmail.com \
--cc=broonie@kernel.org \
--cc=christophe.leroy@csgroup.eu \
--cc=conor+dt@kernel.org \
--cc=devicetree@vger.kernel.org \
--cc=jic23@kernel.org \
--cc=krzysztof.kozlowski+dt@linaro.org \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=lars@metafoo.de \
--cc=lgirdwood@gmail.com \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=perex@perex.cz \
--cc=robh+dt@kernel.org \
--cc=thomas.petazzoni@bootlin.com \
--cc=tiwai@suse.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;
as well as URLs for NNTP newsgroup(s).