ASoC: sma1303: Convert to i2c's .probe_new()

Commit Message

Uwe Kleine-König Jan. 31, 2023, 8:21 a.m. UTC

The probe function doesn't make use of the i2c_device_id * parameter so it
can be trivially converted.

Signed-off-by: Uwe Kleine-König <[e-mail]>
---
Hello,

there is an ongoing effort to convert all drivers to .probe_new to
eventually drop .probe with the i2c_device_id parameter. This driver
currently sits in next so wasn't on my radar before.

My plan is to tackle that after the next merge window. So I ask you to
either apply this patch during the next merge window or accept that it
will go in via the i2c tree together with the patch that drops .probe().

Best regards
Uwe

 sound/soc/codecs/sma1303.c | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)


base-commit: 5b28c049ff53cf49e3a97d80cebd2e9c2779ea96

Comments

Mark Brown Jan. 31, 2023, 2:32 p.m. UTC | #1

On Tue, 31 Jan 2023 09:21:07 +0100, Uwe Kleine-König wrote:
> The probe function doesn't make use of the i2c_device_id * parameter so it
> can be trivially converted.
> 
> 

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: sma1303: Convert to i2c's .probe_new()
      commit: 30cf002579969120ce926dffa3630afbb2ae899f

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark

Patch

diff --git a/sound/soc/codecs/sma1303.c b/sound/soc/codecs/sma1303.c
index 3d8e3900f5c3..fbedba574ff4 100644
--- a/sound/soc/codecs/sma1303.c
+++ b/sound/soc/codecs/sma1303.c
@@ -1597,8 +1597,7 @@  static struct attribute_group sma1303_attr_group = {
 	.attrs = sma1303_attr,
 };
 
-static int sma1303_i2c_probe(struct i2c_client *client,
-				const struct i2c_device_id *id)
+static int sma1303_i2c_probe(struct i2c_client *client)
 {
 	struct sma1303_priv *sma1303;
 	struct device_node *np = client->dev.of_node;
@@ -1791,7 +1790,7 @@  static struct i2c_driver sma1303_i2c_driver = {
 		.name = "sma1303",
 		.of_match_table = sma1303_of_match,
 	},
-	.probe = sma1303_i2c_probe,
+	.probe_new = sma1303_i2c_probe,
 	.remove = sma1303_i2c_remove,
 	.id_table = sma1303_i2c_id,
 };