From: Thorsten Blum <thorsten.blum@linux.dev>
To: Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Jaroslav Kysela <perex@perex.cz>,
Takashi Iwai <tiwai@suse.com>,
Chris Morgan <macromorgan@hotmail.com>,
Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
Dan Carpenter <dan.carpenter@linaro.org>,
Thorsten Blum <thorsten.blum@linux.dev>,
Weidong Wang <wangweidong.a@awinic.com>,
Marco Crivellari <marco.crivellari@suse.com>,
Luca Weiss <luca.weiss@fairphone.com>,
Alexandre Ferrieux <alexandre.ferrieux@orange.com>,
Bharadwaj Raju <bharadwaj.raju@machinesoul.in>,
Charles Keepax <ckeepax@opensource.cirrus.com>,
Srinivas Kandagatla <srinivas.kandagatla@oss.qualcomm.com>,
Chen Ni <nichen@iscas.ac.cn>,
Krzysztof Kozlowski <krzk@kernel.org>
Cc: linux-sound@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] ASoC: codecs: inline i2c_check_functionality checks
Date: Sun, 29 Mar 2026 18:31:46 +0200 [thread overview]
Message-ID: <20260329163152.366356-2-thorsten.blum@linux.dev> (raw)
Inline i2c_check_functionality() checks, since the function returns a
boolean status rather than an error code.
Signed-off-by: Thorsten Blum <thorsten.blum@linux.dev>
---
sound/soc/codecs/aw87390.c | 3 +--
sound/soc/codecs/aw88081.c | 3 +--
sound/soc/codecs/aw88261.c | 3 +--
sound/soc/codecs/max98390.c | 6 ++----
sound/soc/codecs/max98520.c | 4 ++--
5 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/sound/soc/codecs/aw87390.c b/sound/soc/codecs/aw87390.c
index 613daccca3af..37ca42a25889 100644
--- a/sound/soc/codecs/aw87390.c
+++ b/sound/soc/codecs/aw87390.c
@@ -544,8 +544,7 @@ static int aw87390_i2c_probe(struct i2c_client *i2c)
const struct snd_soc_component_driver *priv;
int ret;
- ret = i2c_check_functionality(i2c->adapter, I2C_FUNC_I2C);
- if (!ret)
+ if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_I2C))
return dev_err_probe(&i2c->dev, -ENXIO, "check_functionality failed\n");
aw87390 = devm_kzalloc(&i2c->dev, sizeof(*aw87390), GFP_KERNEL);
diff --git a/sound/soc/codecs/aw88081.c b/sound/soc/codecs/aw88081.c
index fbd1fd12381a..8c5bb3ea0227 100644
--- a/sound/soc/codecs/aw88081.c
+++ b/sound/soc/codecs/aw88081.c
@@ -1253,8 +1253,7 @@ static int aw88081_i2c_probe(struct i2c_client *i2c)
struct aw88081 *aw88081;
int ret;
- ret = i2c_check_functionality(i2c->adapter, I2C_FUNC_I2C);
- if (!ret)
+ if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_I2C))
return dev_err_probe(&i2c->dev, -ENXIO, "check_functionality failed");
aw88081 = devm_kzalloc(&i2c->dev, sizeof(*aw88081), GFP_KERNEL);
diff --git a/sound/soc/codecs/aw88261.c b/sound/soc/codecs/aw88261.c
index 43c03d3cb252..45f70fc78f87 100644
--- a/sound/soc/codecs/aw88261.c
+++ b/sound/soc/codecs/aw88261.c
@@ -1237,8 +1237,7 @@ static int aw88261_i2c_probe(struct i2c_client *i2c)
struct aw88261 *aw88261;
int ret;
- ret = i2c_check_functionality(i2c->adapter, I2C_FUNC_I2C);
- if (!ret)
+ if (!i2c_check_functionality(i2c->adapter, I2C_FUNC_I2C))
return dev_err_probe(&i2c->dev, -ENXIO, "check_functionality failed");
aw88261 = devm_kzalloc(&i2c->dev, sizeof(*aw88261), GFP_KERNEL);
diff --git a/sound/soc/codecs/max98390.c b/sound/soc/codecs/max98390.c
index ff58805e97d1..65f095c47191 100644
--- a/sound/soc/codecs/max98390.c
+++ b/sound/soc/codecs/max98390.c
@@ -1015,10 +1015,8 @@ static int max98390_i2c_probe(struct i2c_client *i2c)
struct i2c_adapter *adapter = i2c->adapter;
struct gpio_desc *reset_gpio;
- ret = i2c_check_functionality(adapter,
- I2C_FUNC_SMBUS_BYTE
- | I2C_FUNC_SMBUS_BYTE_DATA);
- if (!ret) {
+ if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE |
+ I2C_FUNC_SMBUS_BYTE_DATA)) {
dev_err(&i2c->dev, "I2C check functionality failed\n");
return -ENXIO;
}
diff --git a/sound/soc/codecs/max98520.c b/sound/soc/codecs/max98520.c
index 2bf8976c1828..5bc3d95ade5a 100644
--- a/sound/soc/codecs/max98520.c
+++ b/sound/soc/codecs/max98520.c
@@ -681,8 +681,8 @@ static int max98520_i2c_probe(struct i2c_client *i2c)
struct max98520_priv *max98520;
struct i2c_adapter *adapter = to_i2c_adapter(i2c->dev.parent);
- ret = i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE | I2C_FUNC_SMBUS_BYTE_DATA);
- if (!ret) {
+ if (!i2c_check_functionality(adapter, I2C_FUNC_SMBUS_BYTE |
+ I2C_FUNC_SMBUS_BYTE_DATA)) {
dev_err(&i2c->dev, "I2C check functionality failed\n");
return -ENXIO;
}
next reply other threads:[~2026-03-29 16:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-29 16:31 Thorsten Blum [this message]
2026-03-30 14:06 ` [PATCH] ASoC: codecs: inline i2c_check_functionality checks 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=20260329163152.366356-2-thorsten.blum@linux.dev \
--to=thorsten.blum@linux.dev \
--cc=alexandre.ferrieux@orange.com \
--cc=bharadwaj.raju@machinesoul.in \
--cc=broonie@kernel.org \
--cc=ckeepax@opensource.cirrus.com \
--cc=dan.carpenter@linaro.org \
--cc=krzk@kernel.org \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=luca.weiss@fairphone.com \
--cc=macromorgan@hotmail.com \
--cc=marco.crivellari@suse.com \
--cc=nichen@iscas.ac.cn \
--cc=perex@perex.cz \
--cc=srinivas.kandagatla@oss.qualcomm.com \
--cc=tiwai@suse.com \
--cc=wangweidong.a@awinic.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 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.