Commit a327bdc6 authored by Stephen Kitt's avatar Stephen Kitt Committed by Mark Brown

ASoC: es83*: use simple i2c probe function

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: default avatarStephen Kitt <steve@sk2.org>
Link: https://lore.kernel.org/r/20220405165836.2165310-4-steve@sk2.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent e86e7de1
...@@ -789,8 +789,7 @@ static const struct regmap_config es8316_regmap = { ...@@ -789,8 +789,7 @@ static const struct regmap_config es8316_regmap = {
.cache_type = REGCACHE_RBTREE, .cache_type = REGCACHE_RBTREE,
}; };
static int es8316_i2c_probe(struct i2c_client *i2c_client, static int es8316_i2c_probe(struct i2c_client *i2c_client)
const struct i2c_device_id *id)
{ {
struct device *dev = &i2c_client->dev; struct device *dev = &i2c_client->dev;
struct es8316_priv *es8316; struct es8316_priv *es8316;
...@@ -852,7 +851,7 @@ static struct i2c_driver es8316_i2c_driver = { ...@@ -852,7 +851,7 @@ static struct i2c_driver es8316_i2c_driver = {
.acpi_match_table = ACPI_PTR(es8316_acpi_match), .acpi_match_table = ACPI_PTR(es8316_acpi_match),
.of_match_table = of_match_ptr(es8316_of_match), .of_match_table = of_match_ptr(es8316_of_match),
}, },
.probe = es8316_i2c_probe, .probe_new = es8316_i2c_probe,
.id_table = es8316_i2c_id, .id_table = es8316_i2c_id,
}; };
module_i2c_driver(es8316_i2c_driver); module_i2c_driver(es8316_i2c_driver);
......
...@@ -29,8 +29,7 @@ static const struct of_device_id es8328_of_match[] = { ...@@ -29,8 +29,7 @@ static const struct of_device_id es8328_of_match[] = {
}; };
MODULE_DEVICE_TABLE(of, es8328_of_match); MODULE_DEVICE_TABLE(of, es8328_of_match);
static int es8328_i2c_probe(struct i2c_client *i2c, static int es8328_i2c_probe(struct i2c_client *i2c)
const struct i2c_device_id *id)
{ {
return es8328_probe(&i2c->dev, return es8328_probe(&i2c->dev,
devm_regmap_init_i2c(i2c, &es8328_regmap_config)); devm_regmap_init_i2c(i2c, &es8328_regmap_config));
...@@ -41,7 +40,7 @@ static struct i2c_driver es8328_i2c_driver = { ...@@ -41,7 +40,7 @@ static struct i2c_driver es8328_i2c_driver = {
.name = "es8328", .name = "es8328",
.of_match_table = es8328_of_match, .of_match_table = es8328_of_match,
}, },
.probe = es8328_i2c_probe, .probe_new = es8328_i2c_probe,
.id_table = es8328_id, .id_table = es8328_id,
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment