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

ASoC: tas*: 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-11-steve@sk2.orgSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 6f51c158
...@@ -681,8 +681,7 @@ static const struct regmap_config tas2552_regmap_config = { ...@@ -681,8 +681,7 @@ static const struct regmap_config tas2552_regmap_config = {
.cache_type = REGCACHE_RBTREE, .cache_type = REGCACHE_RBTREE,
}; };
static int tas2552_probe(struct i2c_client *client, static int tas2552_probe(struct i2c_client *client)
const struct i2c_device_id *id)
{ {
struct device *dev; struct device *dev;
struct tas2552_data *data; struct tas2552_data *data;
...@@ -764,7 +763,7 @@ static struct i2c_driver tas2552_i2c_driver = { ...@@ -764,7 +763,7 @@ static struct i2c_driver tas2552_i2c_driver = {
.of_match_table = of_match_ptr(tas2552_of_match), .of_match_table = of_match_ptr(tas2552_of_match),
.pm = &tas2552_pm, .pm = &tas2552_pm,
}, },
.probe = tas2552_probe, .probe_new = tas2552_probe,
.remove = tas2552_i2c_remove, .remove = tas2552_i2c_remove,
.id_table = tas2552_id, .id_table = tas2552_id,
}; };
......
...@@ -621,8 +621,7 @@ static int tas2764_parse_dt(struct device *dev, struct tas2764_priv *tas2764) ...@@ -621,8 +621,7 @@ static int tas2764_parse_dt(struct device *dev, struct tas2764_priv *tas2764)
return 0; return 0;
} }
static int tas2764_i2c_probe(struct i2c_client *client, static int tas2764_i2c_probe(struct i2c_client *client)
const struct i2c_device_id *id)
{ {
struct tas2764_priv *tas2764; struct tas2764_priv *tas2764;
int result; int result;
...@@ -678,7 +677,7 @@ static struct i2c_driver tas2764_i2c_driver = { ...@@ -678,7 +677,7 @@ static struct i2c_driver tas2764_i2c_driver = {
.name = "tas2764", .name = "tas2764",
.of_match_table = of_match_ptr(tas2764_of_match), .of_match_table = of_match_ptr(tas2764_of_match),
}, },
.probe = tas2764_i2c_probe, .probe_new = tas2764_i2c_probe,
.id_table = tas2764_i2c_id, .id_table = tas2764_i2c_id,
}; };
module_i2c_driver(tas2764_i2c_driver); module_i2c_driver(tas2764_i2c_driver);
......
...@@ -672,8 +672,7 @@ static int tas2770_parse_dt(struct device *dev, struct tas2770_priv *tas2770) ...@@ -672,8 +672,7 @@ static int tas2770_parse_dt(struct device *dev, struct tas2770_priv *tas2770)
return 0; return 0;
} }
static int tas2770_i2c_probe(struct i2c_client *client, static int tas2770_i2c_probe(struct i2c_client *client)
const struct i2c_device_id *id)
{ {
struct tas2770_priv *tas2770; struct tas2770_priv *tas2770;
int result; int result;
...@@ -739,7 +738,7 @@ static struct i2c_driver tas2770_i2c_driver = { ...@@ -739,7 +738,7 @@ static struct i2c_driver tas2770_i2c_driver = {
.name = "tas2770", .name = "tas2770",
.of_match_table = of_match_ptr(tas2770_of_match), .of_match_table = of_match_ptr(tas2770_of_match),
}, },
.probe = tas2770_i2c_probe, .probe_new = tas2770_i2c_probe,
.id_table = tas2770_i2c_id, .id_table = tas2770_i2c_id,
}; };
module_i2c_driver(tas2770_i2c_driver); module_i2c_driver(tas2770_i2c_driver);
......
...@@ -911,8 +911,7 @@ static const struct regmap_config tas5086_regmap = { ...@@ -911,8 +911,7 @@ static const struct regmap_config tas5086_regmap = {
.reg_write = tas5086_reg_write, .reg_write = tas5086_reg_write,
}; };
static int tas5086_i2c_probe(struct i2c_client *i2c, static int tas5086_i2c_probe(struct i2c_client *i2c)
const struct i2c_device_id *id)
{ {
struct tas5086_private *priv; struct tas5086_private *priv;
struct device *dev = &i2c->dev; struct device *dev = &i2c->dev;
...@@ -994,7 +993,7 @@ static struct i2c_driver tas5086_i2c_driver = { ...@@ -994,7 +993,7 @@ static struct i2c_driver tas5086_i2c_driver = {
.of_match_table = of_match_ptr(tas5086_dt_ids), .of_match_table = of_match_ptr(tas5086_dt_ids),
}, },
.id_table = tas5086_i2c_id, .id_table = tas5086_i2c_id,
.probe = tas5086_i2c_probe, .probe_new = tas5086_i2c_probe,
.remove = tas5086_i2c_remove, .remove = tas5086_i2c_remove,
}; };
......
...@@ -682,8 +682,7 @@ static const struct of_device_id tas6424_of_ids[] = { ...@@ -682,8 +682,7 @@ static const struct of_device_id tas6424_of_ids[] = {
MODULE_DEVICE_TABLE(of, tas6424_of_ids); MODULE_DEVICE_TABLE(of, tas6424_of_ids);
#endif #endif
static int tas6424_i2c_probe(struct i2c_client *client, static int tas6424_i2c_probe(struct i2c_client *client)
const struct i2c_device_id *id)
{ {
struct device *dev = &client->dev; struct device *dev = &client->dev;
struct tas6424_data *tas6424; struct tas6424_data *tas6424;
...@@ -805,7 +804,7 @@ static struct i2c_driver tas6424_i2c_driver = { ...@@ -805,7 +804,7 @@ static struct i2c_driver tas6424_i2c_driver = {
.name = "tas6424", .name = "tas6424",
.of_match_table = of_match_ptr(tas6424_of_ids), .of_match_table = of_match_ptr(tas6424_of_ids),
}, },
.probe = tas6424_i2c_probe, .probe_new = tas6424_i2c_probe,
.remove = tas6424_i2c_remove, .remove = tas6424_i2c_remove,
.id_table = tas6424_i2c_ids, .id_table = tas6424_i2c_ids,
}; };
......
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