iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: ad1*, ada*, ssm*: use i2c_match_id and simple i2c probe

Browse Source 
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>
This commit is contained in:
Stephen Kitt 2022-03-25 17:54:52 +01:00 committed by Mark Brown
parent 900dedd7e4
commit e5cd0623d7
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
5 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sound/soc/codecs/ad193x-i2c.c
View File

@ -20,10 +20,10 @@ static const struct i2c_device_id ad193x_id[] = {
}; };
MODULE_DEVICE_TABLE(i2c, ad193x_id); MODULE_DEVICE_TABLE(i2c, ad193x_id);
static int ad193x_i2c_probe(struct i2c_client *client, static int ad193x_i2c_probe(struct i2c_client *client)
const struct i2c_device_id *id)
{ {
struct regmap_config config; struct regmap_config config;
const struct i2c_device_id *id = i2c_match_id(ad193x_id, client);
config = ad193x_regmap_config; config = ad193x_regmap_config;
config.val_bits = 8; config.val_bits = 8;
@ -38,7 +38,7 @@ static struct i2c_driver ad193x_i2c_driver = {
.driver = { .driver = {
.name = "ad193x", .name = "ad193x",
}, },
.probe = ad193x_i2c_probe, .probe_new = ad193x_i2c_probe,
.id_table = ad193x_id, .id_table = ad193x_id,
}; };
module_i2c_driver(ad193x_i2c_driver); module_i2c_driver(ad193x_i2c_driver);

8
sound/soc/codecs/adau1761-i2c.c
View File

@ -14,10 +14,12 @@
#include "adau1761.h" #include "adau1761.h"
static int adau1761_i2c_probe(struct i2c_client *client, static const struct i2c_device_id adau1761_i2c_ids[];
const struct i2c_device_id *id)
static int adau1761_i2c_probe(struct i2c_client *client)
{ {
struct regmap_config config; struct regmap_config config;
const struct i2c_device_id *id = i2c_match_id(adau1761_i2c_ids, client);
config = adau1761_regmap_config; config = adau1761_regmap_config;
config.val_bits = 8; config.val_bits = 8;
@ -59,7 +61,7 @@ static struct i2c_driver adau1761_i2c_driver = {
.name = "adau1761", .name = "adau1761",
.of_match_table = of_match_ptr(adau1761_i2c_dt_ids), .of_match_table = of_match_ptr(adau1761_i2c_dt_ids),
}, },
.probe = adau1761_i2c_probe, .probe_new = adau1761_i2c_probe,
.remove = adau1761_i2c_remove, .remove = adau1761_i2c_remove,
.id_table = adau1761_i2c_ids, .id_table = adau1761_i2c_ids,
}; };

8
sound/soc/codecs/adau1781-i2c.c
View File

@ -14,10 +14,12 @@
#include "adau1781.h" #include "adau1781.h"
static int adau1781_i2c_probe(struct i2c_client *client, static const struct i2c_device_id adau1781_i2c_ids[];
const struct i2c_device_id *id)
static int adau1781_i2c_probe(struct i2c_client *client)
{ {
struct regmap_config config; struct regmap_config config;
const struct i2c_device_id *id = i2c_match_id(adau1781_i2c_ids, client);
config = adau1781_regmap_config; config = adau1781_regmap_config;
config.val_bits = 8; config.val_bits = 8;
@ -55,7 +57,7 @@ static struct i2c_driver adau1781_i2c_driver = {
.name = "adau1781", .name = "adau1781",
.of_match_table = of_match_ptr(adau1781_i2c_dt_ids), .of_match_table = of_match_ptr(adau1781_i2c_dt_ids),
}, },
.probe = adau1781_i2c_probe, .probe_new = adau1781_i2c_probe,
.remove = adau1781_i2c_remove, .remove = adau1781_i2c_remove,
.id_table = adau1781_i2c_ids, .id_table = adau1781_i2c_ids,
}; };

8
sound/soc/codecs/adau1977-i2c.c
View File

@ -14,10 +14,12 @@
#include "adau1977.h" #include "adau1977.h"
static int adau1977_i2c_probe(struct i2c_client *client, static const struct i2c_device_id adau1977_i2c_ids[];
const struct i2c_device_id *id)
static int adau1977_i2c_probe(struct i2c_client *client)
{ {
struct regmap_config config; struct regmap_config config;
const struct i2c_device_id *id = i2c_match_id(adau1977_i2c_ids, client);
config = adau1977_regmap_config; config = adau1977_regmap_config;
config.val_bits = 8; config.val_bits = 8;
@ -40,7 +42,7 @@ static struct i2c_driver adau1977_i2c_driver = {
.driver = { .driver = {
.name = "adau1977", .name = "adau1977",
}, },
.probe = adau1977_i2c_probe, .probe_new = adau1977_i2c_probe,
.id_table = adau1977_i2c_ids, .id_table = adau1977_i2c_ids,
}; };
module_i2c_driver(adau1977_i2c_driver); module_i2c_driver(adau1977_i2c_driver);

8
sound/soc/codecs/ssm2602-i2c.c
View File

@ -13,15 +13,17 @@
#include "ssm2602.h" #include "ssm2602.h"
static const struct i2c_device_id ssm2602_i2c_id[];
/* /*
* ssm2602 2 wire address is determined by GPIO5 * ssm2602 2 wire address is determined by GPIO5
* state during powerup. * state during powerup.
* low = 0x1a * low = 0x1a
* high = 0x1b * high = 0x1b
*/ */
static int ssm2602_i2c_probe(struct i2c_client *client, static int ssm2602_i2c_probe(struct i2c_client *client)
const struct i2c_device_id *id)
{ {
const struct i2c_device_id *id = i2c_match_id(ssm2602_i2c_id, client);
return ssm2602_probe(&client->dev, id->driver_data, return ssm2602_probe(&client->dev, id->driver_data,
devm_regmap_init_i2c(client, &ssm2602_regmap_config)); devm_regmap_init_i2c(client, &ssm2602_regmap_config));
} }
@ -47,7 +49,7 @@ static struct i2c_driver ssm2602_i2c_driver = {
.name = "ssm2602", .name = "ssm2602",
.of_match_table = ssm2602_of_match, .of_match_table = ssm2602_of_match,
}, },
.probe = ssm2602_i2c_probe, .probe_new = ssm2602_i2c_probe,
.id_table = ssm2602_i2c_id, .id_table = ssm2602_i2c_id,
}; };
module_i2c_driver(ssm2602_i2c_driver); module_i2c_driver(ssm2602_i2c_driver);