From: Stephen Kitt <steve@sk2.org>
To: Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>
Cc: Wolfram Sang <wsa@kernel.org>,
linux-kernel@vger.kernel.org, Stephen Kitt <steve@sk2.org>
Subject: [PATCH 12/14] ASoC: tlv320*: use simple i2c probe function
Date: Tue, 5 Apr 2022 18:58:34 +0200 [thread overview]
Message-ID: <20220405165836.2165310-13-steve@sk2.org> (raw)
In-Reply-To: <20220405165836.2165310-1-steve@sk2.org>
The i2c probe functions here don't use the id information provided in
their second argument, so the single-parameter i2c probe function
("probe_new") can be used instead.
This avoids scanning the identifier tables during probes.
Signed-off-by: Stephen Kitt <steve@sk2.org>
---
sound/soc/codecs/tlv320adcx140.c | 5 ++---
sound/soc/codecs/tlv320aic23-i2c.c | 5 ++---
sound/soc/codecs/tlv320dac33.c | 5 ++---
3 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/sound/soc/codecs/tlv320adcx140.c b/sound/soc/codecs/tlv320adcx140.c
index 32b120d624b2..0b06fbb14171 100644
--- a/sound/soc/codecs/tlv320adcx140.c
+++ b/sound/soc/codecs/tlv320adcx140.c
@@ -1083,8 +1083,7 @@ static const struct of_device_id tlv320adcx140_of_match[] = {
MODULE_DEVICE_TABLE(of, tlv320adcx140_of_match);
#endif
-static int adcx140_i2c_probe(struct i2c_client *i2c,
- const struct i2c_device_id *id)
+static int adcx140_i2c_probe(struct i2c_client *i2c)
{
struct adcx140_priv *adcx140;
int ret;
@@ -1143,7 +1142,7 @@ static struct i2c_driver adcx140_i2c_driver = {
.name = "tlv320adcx140-codec",
.of_match_table = of_match_ptr(tlv320adcx140_of_match),
},
- .probe = adcx140_i2c_probe,
+ .probe_new = adcx140_i2c_probe,
.id_table = adcx140_i2c_id,
};
module_i2c_driver(adcx140_i2c_driver);
diff --git a/sound/soc/codecs/tlv320aic23-i2c.c b/sound/soc/codecs/tlv320aic23-i2c.c
index dbb8f969274c..1f97673a1cc0 100644
--- a/sound/soc/codecs/tlv320aic23-i2c.c
+++ b/sound/soc/codecs/tlv320aic23-i2c.c
@@ -16,8 +16,7 @@
#include "tlv320aic23.h"
-static int tlv320aic23_i2c_probe(struct i2c_client *i2c,
- const struct i2c_device_id *i2c_id)
+static int tlv320aic23_i2c_probe(struct i2c_client *i2c)
{
struct regmap *regmap;
@@ -48,7 +47,7 @@ static struct i2c_driver tlv320aic23_i2c_driver = {
.name = "tlv320aic23-codec",
.of_match_table = of_match_ptr(tlv320aic23_of_match),
},
- .probe = tlv320aic23_i2c_probe,
+ .probe_new = tlv320aic23_i2c_probe,
.id_table = tlv320aic23_id,
};
diff --git a/sound/soc/codecs/tlv320dac33.c b/sound/soc/codecs/tlv320dac33.c
index 48572d66cb3b..66f1d1cd6cf0 100644
--- a/sound/soc/codecs/tlv320dac33.c
+++ b/sound/soc/codecs/tlv320dac33.c
@@ -1463,8 +1463,7 @@ static struct snd_soc_dai_driver dac33_dai = {
.ops = &dac33_dai_ops,
};
-static int dac33_i2c_probe(struct i2c_client *client,
- const struct i2c_device_id *id)
+static int dac33_i2c_probe(struct i2c_client *client)
{
struct tlv320dac33_platform_data *pdata;
struct tlv320dac33_priv *dac33;
@@ -1566,7 +1565,7 @@ static struct i2c_driver tlv320dac33_i2c_driver = {
.driver = {
.name = "tlv320dac33-codec",
},
- .probe = dac33_i2c_probe,
+ .probe_new = dac33_i2c_probe,
.remove = dac33_i2c_remove,
.id_table = tlv320dac33_i2c_id,
};
--
2.27.0
next prev parent reply other threads:[~2022-04-05 22:39 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-05 16:58 [PATCH 00/14] ASoC: remaining simple i2c probe changes Stephen Kitt
2022-04-05 16:58 ` [PATCH 01/14] ASoC: ak4*: use simple i2c probe function Stephen Kitt
2022-04-05 16:58 ` [PATCH 02/14] ASoC: cx2072x: " Stephen Kitt
2022-04-05 16:58 ` [PATCH 03/14] ASoC: es83*: " Stephen Kitt
2022-04-05 16:58 ` [PATCH 04/14] ASoC: lm4857: " Stephen Kitt
2022-04-05 16:58 ` [PATCH 05/14] ASoC: max9*: " Stephen Kitt
2022-04-05 16:58 ` [PATCH 06/14] ASoC: ml26124: " Stephen Kitt
2022-04-05 16:58 ` [PATCH 07/14] ASoC: nau8*: " Stephen Kitt
2022-04-05 16:58 ` [PATCH 08/14] ASoC: pcm*: " Stephen Kitt
2022-04-05 16:58 ` [PATCH 09/14] ASoC: sta*: " Stephen Kitt
2022-04-05 16:58 ` [PATCH 10/14] ASoC: tas*: " Stephen Kitt
2022-04-05 16:58 ` [PATCH 11/14] ASoC: tda7419: " Stephen Kitt
2022-04-05 16:58 ` Stephen Kitt [this message]
2022-04-05 16:58 ` [PATCH 13/14] ASoC: ts3a227e: " Stephen Kitt
2022-04-05 16:58 ` [PATCH 14/14] ASoC: uda1380: " Stephen Kitt
2022-04-12 17:38 ` [PATCH 00/14] ASoC: remaining simple i2c probe changes 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=20220405165836.2165310-13-steve@sk2.org \
--to=steve@sk2.org \
--cc=broonie@kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=wsa@kernel.org \
/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
all inboxes | Powered by JetHome®