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

ASoC: ak4*: 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-2-steve@sk2.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 239556a3
...@@ -356,8 +356,7 @@ static const struct regmap_config ak4118_regmap = { ...@@ -356,8 +356,7 @@ static const struct regmap_config ak4118_regmap = {
.max_register = AK4118_REG_MAX - 1, .max_register = AK4118_REG_MAX - 1,
}; };
static int ak4118_i2c_probe(struct i2c_client *i2c, static int ak4118_i2c_probe(struct i2c_client *i2c)
const struct i2c_device_id *id)
{ {
struct ak4118_priv *ak4118; struct ak4118_priv *ak4118;
int ret; int ret;
...@@ -416,7 +415,7 @@ static struct i2c_driver ak4118_i2c_driver = { ...@@ -416,7 +415,7 @@ static struct i2c_driver ak4118_i2c_driver = {
.of_match_table = of_match_ptr(ak4118_of_match), .of_match_table = of_match_ptr(ak4118_of_match),
}, },
.id_table = ak4118_id_table, .id_table = ak4118_id_table,
.probe = ak4118_i2c_probe, .probe_new = ak4118_i2c_probe,
}; };
module_i2c_driver(ak4118_i2c_driver); module_i2c_driver(ak4118_i2c_driver);
......
...@@ -405,8 +405,7 @@ static const struct snd_soc_component_driver soc_component_dev_ak4535 = { ...@@ -405,8 +405,7 @@ static const struct snd_soc_component_driver soc_component_dev_ak4535 = {
.non_legacy_dai_naming = 1, .non_legacy_dai_naming = 1,
}; };
static int ak4535_i2c_probe(struct i2c_client *i2c, static int ak4535_i2c_probe(struct i2c_client *i2c)
const struct i2c_device_id *id)
{ {
struct ak4535_priv *ak4535; struct ak4535_priv *ak4535;
int ret; int ret;
...@@ -441,7 +440,7 @@ static struct i2c_driver ak4535_i2c_driver = { ...@@ -441,7 +440,7 @@ static struct i2c_driver ak4535_i2c_driver = {
.driver = { .driver = {
.name = "ak4535", .name = "ak4535",
}, },
.probe = ak4535_i2c_probe, .probe_new = ak4535_i2c_probe,
.id_table = ak4535_i2c_id, .id_table = ak4535_i2c_id,
}; };
......
...@@ -548,8 +548,7 @@ static const struct regmap_config ak4641_regmap = { ...@@ -548,8 +548,7 @@ static const struct regmap_config ak4641_regmap = {
.cache_type = REGCACHE_RBTREE, .cache_type = REGCACHE_RBTREE,
}; };
static int ak4641_i2c_probe(struct i2c_client *i2c, static int ak4641_i2c_probe(struct i2c_client *i2c)
const struct i2c_device_id *id)
{ {
struct ak4641_platform_data *pdata = i2c->dev.platform_data; struct ak4641_platform_data *pdata = i2c->dev.platform_data;
struct ak4641_priv *ak4641; struct ak4641_priv *ak4641;
...@@ -632,7 +631,7 @@ static struct i2c_driver ak4641_i2c_driver = { ...@@ -632,7 +631,7 @@ static struct i2c_driver ak4641_i2c_driver = {
.driver = { .driver = {
.name = "ak4641", .name = "ak4641",
}, },
.probe = ak4641_i2c_probe, .probe_new = ak4641_i2c_probe,
.remove = ak4641_i2c_remove, .remove = ak4641_i2c_remove,
.id_table = ak4641_i2c_id, .id_table = ak4641_i2c_id,
}; };
......
...@@ -629,8 +629,7 @@ static const struct regmap_config ak4671_regmap = { ...@@ -629,8 +629,7 @@ static const struct regmap_config ak4671_regmap = {
.cache_type = REGCACHE_RBTREE, .cache_type = REGCACHE_RBTREE,
}; };
static int ak4671_i2c_probe(struct i2c_client *client, static int ak4671_i2c_probe(struct i2c_client *client)
const struct i2c_device_id *id)
{ {
struct regmap *regmap; struct regmap *regmap;
int ret; int ret;
...@@ -657,7 +656,7 @@ static struct i2c_driver ak4671_i2c_driver = { ...@@ -657,7 +656,7 @@ static struct i2c_driver ak4671_i2c_driver = {
.driver = { .driver = {
.name = "ak4671-codec", .name = "ak4671-codec",
}, },
.probe = ak4671_i2c_probe, .probe_new = ak4671_i2c_probe,
.id_table = ak4671_i2c_id, .id_table = ak4671_i2c_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