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

ASoC: da[79]*: 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 avatarAdam Thomson <Adam.Thomson.Opensource@diasemi.com>
Reviewed-by: default avatarWolfram Sang <wsa+renesas@sang-engineering.com>
Link: https://lore.kernel.org/r/20220325171243.1218003-1-steve@sk2.org


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

sound/soc/codecs/da7210.c

+2 −3
Original line number Diff line number Diff line
@@ -1206,8 +1206,7 @@ static const struct regmap_config da7210_regmap_config_i2c = { 
	.cache_type = REGCACHE_RBTREE,

};



static int da7210_i2c_probe(struct i2c_client *i2c,

			    const struct i2c_device_id *id)

static int da7210_i2c_probe(struct i2c_client *i2c)

{

	struct da7210_priv *da7210;

	int ret;
@@ -1250,7 +1249,7 @@ static struct i2c_driver da7210_i2c_driver = { 
	.driver = {

		.name = "da7210",

	},

	.probe		= da7210_i2c_probe,

	.probe_new	= da7210_i2c_probe,

	.id_table	= da7210_i2c_id,

};

#endif

sound/soc/codecs/da7213.c

+2 −3
Original line number Diff line number Diff line
@@ -1946,8 +1946,7 @@ static const char *da7213_supply_names[DA7213_NUM_SUPPLIES] = { 
	[DA7213_SUPPLY_VDDIO] = "VDDIO",

};



static int da7213_i2c_probe(struct i2c_client *i2c,

			    const struct i2c_device_id *id)

static int da7213_i2c_probe(struct i2c_client *i2c)

{

	struct da7213_priv *da7213;

	int i, ret;
@@ -2040,7 +2039,7 @@ static struct i2c_driver da7213_i2c_driver = { 
		.acpi_match_table = ACPI_PTR(da7213_acpi_match),

		.pm = &da7213_pm,

	},

	.probe		= da7213_i2c_probe,

	.probe_new	= da7213_i2c_probe,

	.id_table	= da7213_i2c_id,

};

sound/soc/codecs/da7219.c

+2 −3
Original line number Diff line number Diff line
@@ -2649,8 +2649,7 @@ static const struct snd_soc_component_driver soc_component_dev_da7219 = { 
 * I2C layer

 */



static int da7219_i2c_probe(struct i2c_client *i2c,

			    const struct i2c_device_id *id)

static int da7219_i2c_probe(struct i2c_client *i2c)

{

	struct device *dev = &i2c->dev;

	struct da7219_priv *da7219;
@@ -2705,7 +2704,7 @@ static struct i2c_driver da7219_i2c_driver = { 
		.of_match_table = of_match_ptr(da7219_of_match),

		.acpi_match_table = ACPI_PTR(da7219_acpi_match),

	},

	.probe		= da7219_i2c_probe,

	.probe_new	= da7219_i2c_probe,

	.remove		= da7219_i2c_remove,

	.id_table	= da7219_i2c_id,

};

sound/soc/codecs/da732x.c

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

};



static int da732x_i2c_probe(struct i2c_client *i2c,

			    const struct i2c_device_id *id)

static int da732x_i2c_probe(struct i2c_client *i2c)

{

	struct da732x_priv *da732x;

	unsigned int reg;
@@ -1562,7 +1561,7 @@ static struct i2c_driver da732x_i2c_driver = { 
	.driver		= {

		.name	= "da7320",

	},

	.probe		= da732x_i2c_probe,

	.probe_new	= da732x_i2c_probe,

	.remove		= da732x_i2c_remove,

	.id_table	= da732x_i2c_id,

};

sound/soc/codecs/da9055.c

+2 −3
Original line number Diff line number Diff line
@@ -1473,8 +1473,7 @@ static const struct regmap_config da9055_regmap_config = { 
	.cache_type = REGCACHE_RBTREE,

};



static int da9055_i2c_probe(struct i2c_client *i2c,

			    const struct i2c_device_id *id)

static int da9055_i2c_probe(struct i2c_client *i2c)

{

	struct da9055_priv *da9055;

	struct da9055_platform_data *pdata = dev_get_platdata(&i2c->dev);
@@ -1533,7 +1532,7 @@ static struct i2c_driver da9055_i2c_driver = { 
		.name = "da9055-codec",

		.of_match_table = of_match_ptr(da9055_of_match),

	},

	.probe		= da9055_i2c_probe,

	.probe_new	= da9055_i2c_probe,

	.id_table	= da9055_i2c_id,

};