Unverified Commit b79bd63a authored by Stephen Kitt's avatar Stephen Kitt Committed by Mark Brown
Browse files

ASoC: ada*, ssm*: 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>
Reviewed-by: default avatarNuno Sá <nuno.sa@analog.com>
Reviewed-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20220325164828.1209201-1-steve@sk2.org


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 9f342904

sound/soc/codecs/adau1372-i2c.c

+2 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


#include "adau1372.h"



static int adau1372_i2c_probe(struct i2c_client *client, const struct i2c_device_id *id)

static int adau1372_i2c_probe(struct i2c_client *client)

{

	return adau1372_probe(&client->dev,

		devm_regmap_init_i2c(client, &adau1372_regmap_config), NULL);
@@ -30,7 +30,7 @@ static struct i2c_driver adau1372_i2c_driver = { 
	.driver = {

		.name = "adau1372",

	},

	.probe = adau1372_i2c_probe,

	.probe_new = adau1372_i2c_probe,

	.id_table = adau1372_i2c_ids,

};

module_i2c_driver(adau1372_i2c_driver);

sound/soc/codecs/adau1373.c

+2 −3
Original line number Diff line number Diff line
@@ -1473,8 +1473,7 @@ static const struct snd_soc_component_driver adau1373_component_driver = { 
	.non_legacy_dai_naming	= 1,

};



static int adau1373_i2c_probe(struct i2c_client *client,

			      const struct i2c_device_id *id)

static int adau1373_i2c_probe(struct i2c_client *client)

{

	struct adau1373 *adau1373;

	int ret;
@@ -1508,7 +1507,7 @@ static struct i2c_driver adau1373_i2c_driver = { 
	.driver = {

		.name = "adau1373",

	},

	.probe = adau1373_i2c_probe,

	.probe_new = adau1373_i2c_probe,

	.id_table = adau1373_i2c_id,

};

sound/soc/codecs/adau1701.c

+2 −3
Original line number Diff line number Diff line
@@ -785,8 +785,7 @@ static const struct regmap_config adau1701_regmap = { 
	.reg_read		= adau1701_reg_read,

};



static int adau1701_i2c_probe(struct i2c_client *client,

			      const struct i2c_device_id *id)

static int adau1701_i2c_probe(struct i2c_client *client)

{

	struct adau1701 *adau1701;

	struct device *dev = &client->dev;
@@ -878,7 +877,7 @@ static struct i2c_driver adau1701_i2c_driver = { 
		.name	= "adau1701",

		.of_match_table	= of_match_ptr(adau1701_dt_ids),

	},

	.probe		= adau1701_i2c_probe,

	.probe_new	= adau1701_i2c_probe,

	.id_table	= adau1701_i2c_id,

};

sound/soc/codecs/adau7118-i2c.c

+2 −3
Original line number Diff line number Diff line
@@ -48,8 +48,7 @@ static const struct regmap_config adau7118_regmap_config = { 
	.volatile_reg = adau7118_volatile,

};



static int adau7118_probe_i2c(struct i2c_client *i2c,

			      const struct i2c_device_id *id)

static int adau7118_probe_i2c(struct i2c_client *i2c)

{

	struct regmap *map;
@@ -79,7 +78,7 @@ static struct i2c_driver adau7118_driver = { 
		.name = "adau7118",

		.of_match_table = adau7118_of_match,

	},

	.probe = adau7118_probe_i2c,

	.probe_new = adau7118_probe_i2c,

	.id_table = adau7118_id,

};

module_i2c_driver(adau7118_driver);

sound/soc/codecs/adav803.c

+2 −3
Original line number Diff line number Diff line
@@ -19,8 +19,7 @@ static const struct i2c_device_id adav803_id[] = { 
};

MODULE_DEVICE_TABLE(i2c, adav803_id);



static int adav803_probe(struct i2c_client *client,

			     const struct i2c_device_id *id)

static int adav803_probe(struct i2c_client *client)

{

	return adav80x_bus_probe(&client->dev,

		devm_regmap_init_i2c(client, &adav80x_regmap_config));
@@ -30,7 +29,7 @@ static struct i2c_driver adav803_driver = { 
	.driver = {

		.name = "adav803",

	},

	.probe = adav803_probe,

	.probe_new = adav803_probe,

	.id_table = adav803_id,

};

module_i2c_driver(adav803_driver);