mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
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 09/14] ASoC: sta*: use simple i2c probe function
Date: Tue,  5 Apr 2022 18:58:31 +0200	[thread overview]
Message-ID: <20220405165836.2165310-10-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/sta32x.c | 5 ++---
 sound/soc/codecs/sta350.c | 5 ++---
 sound/soc/codecs/sta529.c | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/sound/soc/codecs/sta32x.c b/sound/soc/codecs/sta32x.c
index 86528b930de8..0ba6eab991c4 100644
--- a/sound/soc/codecs/sta32x.c
+++ b/sound/soc/codecs/sta32x.c
@@ -1094,8 +1094,7 @@ static int sta32x_probe_dt(struct device *dev, struct sta32x_priv *sta32x)
 }
 #endif
 
-static int sta32x_i2c_probe(struct i2c_client *i2c,
-			    const struct i2c_device_id *id)
+static int sta32x_i2c_probe(struct i2c_client *i2c)
 {
 	struct device *dev = &i2c->dev;
 	struct sta32x_priv *sta32x;
@@ -1175,7 +1174,7 @@ static struct i2c_driver sta32x_i2c_driver = {
 		.name = "sta32x",
 		.of_match_table = of_match_ptr(st32x_dt_ids),
 	},
-	.probe =    sta32x_i2c_probe,
+	.probe_new = sta32x_i2c_probe,
 	.id_table = sta32x_i2c_id,
 };
 
diff --git a/sound/soc/codecs/sta350.c b/sound/soc/codecs/sta350.c
index 75d3b0618ab5..1fb370fc0ae3 100644
--- a/sound/soc/codecs/sta350.c
+++ b/sound/soc/codecs/sta350.c
@@ -1187,8 +1187,7 @@ static int sta350_probe_dt(struct device *dev, struct sta350_priv *sta350)
 }
 #endif
 
-static int sta350_i2c_probe(struct i2c_client *i2c,
-			    const struct i2c_device_id *id)
+static int sta350_i2c_probe(struct i2c_client *i2c)
 {
 	struct device *dev = &i2c->dev;
 	struct sta350_priv *sta350;
@@ -1263,7 +1262,7 @@ static struct i2c_driver sta350_i2c_driver = {
 		.name = "sta350",
 		.of_match_table = of_match_ptr(st350_dt_ids),
 	},
-	.probe =    sta350_i2c_probe,
+	.probe_new = sta350_i2c_probe,
 	.remove =   sta350_i2c_remove,
 	.id_table = sta350_i2c_id,
 };
diff --git a/sound/soc/codecs/sta529.c b/sound/soc/codecs/sta529.c
index 97b5f34027c0..d90e5512a731 100644
--- a/sound/soc/codecs/sta529.c
+++ b/sound/soc/codecs/sta529.c
@@ -337,8 +337,7 @@ static const struct regmap_config sta529_regmap = {
 	.num_reg_defaults = ARRAY_SIZE(sta529_reg_defaults),
 };
 
-static int sta529_i2c_probe(struct i2c_client *i2c,
-			    const struct i2c_device_id *id)
+static int sta529_i2c_probe(struct i2c_client *i2c)
 {
 	struct sta529 *sta529;
 	int ret;
@@ -381,7 +380,7 @@ static struct i2c_driver sta529_i2c_driver = {
 		.name = "sta529",
 		.of_match_table = sta529_of_match,
 	},
-	.probe		= sta529_i2c_probe,
+	.probe_new	= sta529_i2c_probe,
 	.id_table	= sta529_i2c_id,
 };
 
-- 
2.27.0


  parent reply	other threads:[~2022-04-05 20:40 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 ` Stephen Kitt [this message]
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 ` [PATCH 12/14] ASoC: tlv320*: " Stephen Kitt
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-10-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®