ASoC: tpa6130: use i2c_match_id and simple i2c probe
Subsystems (3)
PATCH v3 1/1 ASoC: tpa6130: use i2c_match_id and simple i2c probe
As part of the ongoing i2c transition to the simple probe ("probe_new"), this patch uses i2c_match_id to retrieve the driver_data for the probed device. The id parameter is thus no longer necessary and the simple probe can be used instead.
The i2c id table is moved up before the probe function, as suggested by Wolfram Sang.
---
Changes since v2: added missing probe_new change.
Changes since v1: two missing files were added (in the overall patch series).
--- sound/soc/codecs/tpa6130a2.c | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-)
sound/soc/codecs/tpa6130a2.c +11 -10
@@ -209,13 +209,20 @@ static const struct regmap_config tpa6130a2_regmap_config = { .cache_type = REGCACHE_RBTREE, }; -static int tpa6130a2_probe (struct i2c_client *client, -const struct i2c_device_id *id) +static const struct i2c_device_id tpa6130a2_id[] = { + {"tpa6130a2" ,TPA6130A2 }, + {"tpa6140a2" ,TPA6140A2 }, + { } +}; +MODULE_DEVICE_TABLE (i2c, tpa6130a2_id); + +static int tpa6130a2_probe (struct i2c_client *client) {struct device *dev;struct tpa6130a2_data *data;struct tpa6130a2_platform_data *pdata = client->dev.platform_data;struct device_node *np = client->dev.of_node; +const struct i2c_device_id *id;const char *regulator;unsigned int version;int ret;
@@ -244,6 +251,7 @@ static int tpa6130a2_probe(struct i2c_client *client,i2c_set_clientdata (client, data); + id =i2c_match_id (tpa6130a2_id, client); data->id = id->driver_data;if (data->power_gpio >=0 ) {
@@ -297,13 +305,6 @@ static int tpa6130a2_probe(struct i2c_client *client, &tpa6130a2_component_driver, NULL, 0); } -static const struct i2c_device_id tpa6130a2_id[] = { - {"tpa6130a2" ,TPA6130A2 }, - {"tpa6140a2" ,TPA6140A2 }, - { } -}; -MODULE_DEVICE_TABLE (i2c, tpa6130a2_id); -#if IS_ENABLED (CONFIG_OF )static const struct of_device_id tpa6130a2_of_match[] = { { .compatible = "ti,tpa6130a2", },
@@ -318,7 +319,7 @@ static struct i2c_driver tpa6130a2_i2c_driver = { .name = "tpa6130a2", .of_match_table = of_match_ptr(tpa6130a2_of_match), }, - .probe = tpa6130a2_probe, + .probe_new = tpa6130a2_probe, .id_table = tpa6130a2_id, };
base-commit: 180e66c028cbce98f297962db188965efc7546d7
Signature · 1 line
2.30.2
Mark Brown
maintainerQuoted 9 lines · Stephen Kitt
As part of the ongoing i2c transition to the simple probe ("
probe_new"), this patch usesi2c_match_idto retrieve thedriver_datafor the probed device. The id parameter is thus no longer necessary and the simple probe can be used instead.The i2c id table is moved up before the probe function, as suggested by Wolfram Sang.
[...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: tpa6130: use i2c_match_id and simple i2c probe
commit: 55d2a66cfec6a4196243940f754f5b34dd2106bf
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