Skip to content

L
linux
Commit fead49e3 authored by Stephen Kitt's avatar Stephen Kitt Committed by Mark Brown
Browse files
Options

ASoC: max9*: 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-6-steve@sk2.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 182f3ebd
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 35 deletions
sound/soc/codecs/max9768.c
View file @ fead49e3
...@@ -167,8 +167,7 @@ static const struct regmap_config max9768_i2c_regmap_config = { ...@@ -167,8 +167,7 @@ static const struct regmap_config max9768_i2c_regmap_config = {
.cache_type = REGCACHE_RBTREE, .cache_type = REGCACHE_RBTREE,
}; };
static int max9768_i2c_probe(struct i2c_client *client, static int max9768_i2c_probe(struct i2c_client *client)
const struct i2c_device_id *id)
{ {
struct max9768 *max9768; struct max9768 *max9768;
struct max9768_pdata *pdata = client->dev.platform_data; struct max9768_pdata *pdata = client->dev.platform_data;
...@@ -215,7 +214,7 @@ static struct i2c_driver max9768_i2c_driver = { ...@@ -215,7 +214,7 @@ static struct i2c_driver max9768_i2c_driver = {
.driver = { .driver = {
.name = "max9768", .name = "max9768",
}, },
.probe = max9768_i2c_probe, .probe_new = max9768_i2c_probe,
.id_table = max9768_i2c_id, .id_table = max9768_i2c_id,
}; };
module_i2c_driver(max9768_i2c_driver); module_i2c_driver(max9768_i2c_driver);
......
sound/soc/codecs/max98371.c
View file @ fead49e3
...@@ -365,8 +365,7 @@ static const struct regmap_config max98371_regmap = { ...@@ -365,8 +365,7 @@ static const struct regmap_config max98371_regmap = {
.cache_type = REGCACHE_RBTREE, .cache_type = REGCACHE_RBTREE,
}; };
static int max98371_i2c_probe(struct i2c_client *i2c, static int max98371_i2c_probe(struct i2c_client *i2c)
const struct i2c_device_id *id)
{ {
struct max98371_priv *max98371; struct max98371_priv *max98371;
int ret, reg; int ret, reg;
...@@ -421,7 +420,7 @@ static struct i2c_driver max98371_i2c_driver = { ...@@ -421,7 +420,7 @@ static struct i2c_driver max98371_i2c_driver = {
.name = "max98371", .name = "max98371",
.of_match_table = of_match_ptr(max98371_of_match), .of_match_table = of_match_ptr(max98371_of_match),
}, },
.probe = max98371_i2c_probe, .probe_new = max98371_i2c_probe,
.id_table = max98371_i2c_id, .id_table = max98371_i2c_id,
}; };
......
sound/soc/codecs/max98373-i2c.c
View file @ fead49e3
...@@ -516,8 +516,7 @@ static const struct regmap_config max98373_regmap = { ...@@ -516,8 +516,7 @@ static const struct regmap_config max98373_regmap = {
.cache_type = REGCACHE_RBTREE, .cache_type = REGCACHE_RBTREE,
}; };
static int max98373_i2c_probe(struct i2c_client *i2c, static int max98373_i2c_probe(struct i2c_client *i2c)
const struct i2c_device_id *id)
{ {
int ret = 0; int ret = 0;
int reg = 0; int reg = 0;
...@@ -622,7 +621,7 @@ static struct i2c_driver max98373_i2c_driver = { ...@@ -622,7 +621,7 @@ static struct i2c_driver max98373_i2c_driver = {
.acpi_match_table = ACPI_PTR(max98373_acpi_match), .acpi_match_table = ACPI_PTR(max98373_acpi_match),
.pm = &max98373_pm, .pm = &max98373_pm,
}, },
.probe = max98373_i2c_probe, .probe_new = max98373_i2c_probe,
.id_table = max98373_i2c_id, .id_table = max98373_i2c_id,
}; };
......
sound/soc/codecs/max98390.c
View file @ fead49e3
...@@ -1014,8 +1014,7 @@ static void max98390_slot_config(struct i2c_client *i2c, ...@@ -1014,8 +1014,7 @@ static void max98390_slot_config(struct i2c_client *i2c,
max98390->i_l_slot = 1; max98390->i_l_slot = 1;
} }
static int max98390_i2c_probe(struct i2c_client *i2c, static int max98390_i2c_probe(struct i2c_client *i2c)
const struct i2c_device_id *id)
{ {
int ret = 0; int ret = 0;
int reg = 0; int reg = 0;
...@@ -1121,7 +1120,7 @@ static struct i2c_driver max98390_i2c_driver = { ...@@ -1121,7 +1120,7 @@ static struct i2c_driver max98390_i2c_driver = {
.acpi_match_table = ACPI_PTR(max98390_acpi_match), .acpi_match_table = ACPI_PTR(max98390_acpi_match),
.pm = &max98390_pm, .pm = &max98390_pm,
}, },
.probe = max98390_i2c_probe, .probe_new = max98390_i2c_probe,
.id_table = max98390_i2c_id, .id_table = max98390_i2c_id,
}; };
......
sound/soc/codecs/max9850.c
View file @ fead49e3
...@@ -299,8 +299,7 @@ static const struct snd_soc_component_driver soc_component_dev_max9850 = { ...@@ -299,8 +299,7 @@ static const struct snd_soc_component_driver soc_component_dev_max9850 = {
.non_legacy_dai_naming = 1, .non_legacy_dai_naming = 1,
}; };
static int max9850_i2c_probe(struct i2c_client *i2c, static int max9850_i2c_probe(struct i2c_client *i2c)
const struct i2c_device_id *id)
{ {
struct max9850_priv *max9850; struct max9850_priv *max9850;
int ret; int ret;
...@@ -331,7 +330,7 @@ static struct i2c_driver max9850_i2c_driver = { ...@@ -331,7 +330,7 @@ static struct i2c_driver max9850_i2c_driver = {
.driver = { .driver = {
.name = "max9850", .name = "max9850",
}, },
.probe = max9850_i2c_probe, .probe_new = max9850_i2c_probe,
.id_table = max9850_i2c_id, .id_table = max9850_i2c_id,
}; };
......
sound/soc/codecs/max98504.c
View file @ fead49e3
...@@ -304,8 +304,7 @@ static const struct regmap_config max98504_regmap = { ...@@ -304,8 +304,7 @@ static const struct regmap_config max98504_regmap = {
.cache_type = REGCACHE_RBTREE, .cache_type = REGCACHE_RBTREE,
}; };
static int max98504_i2c_probe(struct i2c_client *client, static int max98504_i2c_probe(struct i2c_client *client)
const struct i2c_device_id *id)
{ {
struct device *dev = &client->dev; struct device *dev = &client->dev;
struct device_node *node = dev->of_node; struct device_node *node = dev->of_node;
...@@ -371,7 +370,7 @@ static struct i2c_driver max98504_i2c_driver = { ...@@ -371,7 +370,7 @@ static struct i2c_driver max98504_i2c_driver = {
.name = "max98504", .name = "max98504",
.of_match_table = of_match_ptr(max98504_of_match), .of_match_table = of_match_ptr(max98504_of_match),
}, },
.probe = max98504_i2c_probe, .probe_new = max98504_i2c_probe,
.id_table = max98504_i2c_id, .id_table = max98504_i2c_id,
}; };
module_i2c_driver(max98504_i2c_driver); module_i2c_driver(max98504_i2c_driver);
......
sound/soc/codecs/max98520.c
View file @ fead49e3
...@@ -677,7 +677,7 @@ static void max98520_power_on(struct max98520_priv *max98520, bool poweron) ...@@ -677,7 +677,7 @@ static void max98520_power_on(struct max98520_priv *max98520, bool poweron)
gpiod_set_value_cansleep(max98520->reset_gpio, !poweron); gpiod_set_value_cansleep(max98520->reset_gpio, !poweron);
} }
static int max98520_i2c_probe(struct i2c_client *i2c, const struct i2c_device_id *id) static int max98520_i2c_probe(struct i2c_client *i2c)
{ {
int ret; int ret;
int reg = 0; int reg = 0;
...@@ -757,7 +757,7 @@ static struct i2c_driver max98520_i2c_driver = { ...@@ -757,7 +757,7 @@ static struct i2c_driver max98520_i2c_driver = {
.of_match_table = of_match_ptr(max98520_of_match), .of_match_table = of_match_ptr(max98520_of_match),
.pm = &max98520_pm, .pm = &max98520_pm,
}, },
.probe = max98520_i2c_probe, .probe_new = max98520_i2c_probe,
.id_table = max98520_i2c_id, .id_table = max98520_i2c_id,
}; };
......
sound/soc/codecs/max9867.c
View file @ fead49e3
...@@ -613,8 +613,7 @@ static const struct regmap_config max9867_regmap = { ...@@ -613,8 +613,7 @@ static const struct regmap_config max9867_regmap = {
.cache_type = REGCACHE_RBTREE, .cache_type = REGCACHE_RBTREE,
}; };
static int max9867_i2c_probe(struct i2c_client *i2c, static int max9867_i2c_probe(struct i2c_client *i2c)
const struct i2c_device_id *id)
{ {
struct max9867_priv *max9867; struct max9867_priv *max9867;
int ret, reg; int ret, reg;
...@@ -662,7 +661,7 @@ static struct i2c_driver max9867_i2c_driver = { ...@@ -662,7 +661,7 @@ static struct i2c_driver max9867_i2c_driver = {
.name = "max9867", .name = "max9867",
.of_match_table = of_match_ptr(max9867_of_match), .of_match_table = of_match_ptr(max9867_of_match),
}, },
.probe = max9867_i2c_probe, .probe_new = max9867_i2c_probe,
.id_table = max9867_i2c_id, .id_table = max9867_i2c_id,
}; };
......
sound/soc/codecs/max9877.c
View file @ fead49e3
...@@ -133,8 +133,7 @@ static const struct regmap_config max9877_regmap = { ...@@ -133,8 +133,7 @@ static const struct regmap_config max9877_regmap = {
.cache_type = REGCACHE_RBTREE, .cache_type = REGCACHE_RBTREE,
}; };
static int max9877_i2c_probe(struct i2c_client *client, static int max9877_i2c_probe(struct i2c_client *client)
const struct i2c_device_id *id)
{ {
struct regmap *regmap; struct regmap *regmap;
int i; int i;
...@@ -161,7 +160,7 @@ static struct i2c_driver max9877_i2c_driver = { ...@@ -161,7 +160,7 @@ static struct i2c_driver max9877_i2c_driver = {
.driver = { .driver = {
.name = "max9877", .name = "max9877",
}, },
.probe = max9877_i2c_probe, .probe_new = max9877_i2c_probe,
.id_table = max9877_i2c_id, .id_table = max9877_i2c_id,
}; };
......
sound/soc/codecs/max98925.c
View file @ fead49e3
...@@ -558,8 +558,7 @@ static const struct regmap_config max98925_regmap = { ...@@ -558,8 +558,7 @@ static const struct regmap_config max98925_regmap = {
.cache_type = REGCACHE_RBTREE, .cache_type = REGCACHE_RBTREE,
}; };
static int max98925_i2c_probe(struct i2c_client *i2c, static int max98925_i2c_probe(struct i2c_client *i2c)
const struct i2c_device_id *id)
{ {
int ret, reg; int ret, reg;
u32 value; u32 value;
...@@ -637,7 +636,7 @@ static struct i2c_driver max98925_i2c_driver = { ...@@ -637,7 +636,7 @@ static struct i2c_driver max98925_i2c_driver = {
.name = "max98925", .name = "max98925",
.of_match_table = of_match_ptr(max98925_of_match), .of_match_table = of_match_ptr(max98925_of_match),
}, },
.probe = max98925_i2c_probe, .probe_new = max98925_i2c_probe,
.id_table = max98925_i2c_id, .id_table = max98925_i2c_id,
}; };
......
sound/soc/codecs/max98926.c
View file @ fead49e3
...@@ -510,8 +510,7 @@ static const struct regmap_config max98926_regmap = { ...@@ -510,8 +510,7 @@ static const struct regmap_config max98926_regmap = {
.cache_type = REGCACHE_RBTREE, .cache_type = REGCACHE_RBTREE,
}; };
static int max98926_i2c_probe(struct i2c_client *i2c, static int max98926_i2c_probe(struct i2c_client *i2c)
const struct i2c_device_id *id)
{ {
int ret, reg; int ret, reg;
u32 value; u32 value;
...@@ -584,7 +583,7 @@ static struct i2c_driver max98926_i2c_driver = { ...@@ -584,7 +583,7 @@ static struct i2c_driver max98926_i2c_driver = {
.name = "max98926", .name = "max98926",
.of_match_table = of_match_ptr(max98926_of_match), .of_match_table = of_match_ptr(max98926_of_match),
}, },
.probe = max98926_i2c_probe, .probe_new = max98926_i2c_probe,
.id_table = max98926_i2c_id, .id_table = max98926_i2c_id,
}; };
......
sound/soc/codecs/max98927.c
View file @ fead49e3
...@@ -863,8 +863,7 @@ static void max98927_slot_config(struct i2c_client *i2c, ...@@ -863,8 +863,7 @@ static void max98927_slot_config(struct i2c_client *i2c,
max98927->i_l_slot = 1; max98927->i_l_slot = 1;
} }
static int max98927_i2c_probe(struct i2c_client *i2c, static int max98927_i2c_probe(struct i2c_client *i2c)
const struct i2c_device_id *id)
{ {
int ret = 0, value; int ret = 0, value;
...@@ -977,7 +976,7 @@ static struct i2c_driver max98927_i2c_driver = { ...@@ -977,7 +976,7 @@ static struct i2c_driver max98927_i2c_driver = {
.acpi_match_table = ACPI_PTR(max98927_acpi_match), .acpi_match_table = ACPI_PTR(max98927_acpi_match),
.pm = &max98927_pm, .pm = &max98927_pm,
}, },
.probe = max98927_i2c_probe, .probe_new = max98927_i2c_probe,
.remove = max98927_i2c_remove, .remove = max98927_i2c_remove,
.id_table = max98927_i2c_id, .id_table = max98927_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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7