diff options
| author | Stephen Kitt <steve@sk2.org> | 2022-03-25 17:54:52 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-04-05 10:23:09 +0100 |
| commit | e5cd0623d7879eb98059223b9eb233a686d58b40 (patch) | |
| tree | cdae77ade01549dcc90ca2b223cf12f39874814a /sound/soc/codecs/ssm2602-i2c.c | |
| parent | 900dedd7e47cc3f8d93dfa0ae6ac6cf49eda0c97 (diff) | |
| download | lwn-e5cd0623d7879eb98059223b9eb233a686d58b40.tar.gz lwn-e5cd0623d7879eb98059223b9eb233a686d58b40.zip | |
ASoC: ad1*, ada*, ssm*: 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.
Signed-off-by: Stephen Kitt <steve@sk2.org>
Reviewed-by: Nuno Sá <nuno.sa@analog.com>
Link: https://lore.kernel.org/r/20220325165452.1212975-1-steve@sk2.org
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/codecs/ssm2602-i2c.c')
| -rw-r--r-- | sound/soc/codecs/ssm2602-i2c.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sound/soc/codecs/ssm2602-i2c.c b/sound/soc/codecs/ssm2602-i2c.c index afab81383d3a..3c85772901f5 100644 --- a/sound/soc/codecs/ssm2602-i2c.c +++ b/sound/soc/codecs/ssm2602-i2c.c @@ -13,15 +13,17 @@ #include "ssm2602.h" +static const struct i2c_device_id ssm2602_i2c_id[]; + /* * ssm2602 2 wire address is determined by GPIO5 * state during powerup. * low = 0x1a * high = 0x1b */ -static int ssm2602_i2c_probe(struct i2c_client *client, - const struct i2c_device_id *id) +static int ssm2602_i2c_probe(struct i2c_client *client) { + const struct i2c_device_id *id = i2c_match_id(ssm2602_i2c_id, client); return ssm2602_probe(&client->dev, id->driver_data, devm_regmap_init_i2c(client, &ssm2602_regmap_config)); } @@ -47,7 +49,7 @@ static struct i2c_driver ssm2602_i2c_driver = { .name = "ssm2602", .of_match_table = ssm2602_of_match, }, - .probe = ssm2602_i2c_probe, + .probe_new = ssm2602_i2c_probe, .id_table = ssm2602_i2c_id, }; module_i2c_driver(ssm2602_i2c_driver); |