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

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: default avatarStephen Kitt <steve@sk2.org>
Reviewed-by: default avatarNuno Sá <nuno.sa@analog.com>
Link: https://lore.kernel.org/r/20220325165452.1212975-1-steve@sk2.org


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

sound/soc/codecs/ad193x-i2c.c

+3 −3
Original line number Diff line number Diff line
@@ -20,10 +20,10 @@ static const struct i2c_device_id ad193x_id[] = { 
};

MODULE_DEVICE_TABLE(i2c, ad193x_id);



static int ad193x_i2c_probe(struct i2c_client *client,

			    const struct i2c_device_id *id)

static int ad193x_i2c_probe(struct i2c_client *client)

{

	struct regmap_config config;

	const struct i2c_device_id *id = i2c_match_id(ad193x_id, client);



	config = ad193x_regmap_config;

	config.val_bits = 8;
@@ -38,7 +38,7 @@ static struct i2c_driver ad193x_i2c_driver = { 
	.driver = {

		.name = "ad193x",

	},

	.probe    = ad193x_i2c_probe,

	.probe_new = ad193x_i2c_probe,

	.id_table = ad193x_id,

};

module_i2c_driver(ad193x_i2c_driver);

sound/soc/codecs/adau1761-i2c.c

+5 −3
Original line number Diff line number Diff line
@@ -14,10 +14,12 @@ 


#include "adau1761.h"



static int adau1761_i2c_probe(struct i2c_client *client,

	const struct i2c_device_id *id)

static const struct i2c_device_id adau1761_i2c_ids[];



static int adau1761_i2c_probe(struct i2c_client *client)

{

	struct regmap_config config;

	const struct i2c_device_id *id = i2c_match_id(adau1761_i2c_ids, client);



	config = adau1761_regmap_config;

	config.val_bits = 8;
@@ -59,7 +61,7 @@ static struct i2c_driver adau1761_i2c_driver = { 
		.name = "adau1761",

		.of_match_table = of_match_ptr(adau1761_i2c_dt_ids),

	},

	.probe = adau1761_i2c_probe,

	.probe_new = adau1761_i2c_probe,

	.remove = adau1761_i2c_remove,

	.id_table = adau1761_i2c_ids,

};

sound/soc/codecs/adau1781-i2c.c

+5 −3
Original line number Diff line number Diff line
@@ -14,10 +14,12 @@ 


#include "adau1781.h"



static int adau1781_i2c_probe(struct i2c_client *client,

	const struct i2c_device_id *id)

static const struct i2c_device_id adau1781_i2c_ids[];



static int adau1781_i2c_probe(struct i2c_client *client)

{

	struct regmap_config config;

	const struct i2c_device_id *id = i2c_match_id(adau1781_i2c_ids, client);



	config = adau1781_regmap_config;

	config.val_bits = 8;
@@ -55,7 +57,7 @@ static struct i2c_driver adau1781_i2c_driver = { 
		.name = "adau1781",

		.of_match_table = of_match_ptr(adau1781_i2c_dt_ids),

	},

	.probe = adau1781_i2c_probe,

	.probe_new = adau1781_i2c_probe,

	.remove = adau1781_i2c_remove,

	.id_table = adau1781_i2c_ids,

};

sound/soc/codecs/adau1977-i2c.c

+5 −3
Original line number Diff line number Diff line
@@ -14,10 +14,12 @@ 


#include "adau1977.h"



static int adau1977_i2c_probe(struct i2c_client *client,

	const struct i2c_device_id *id)

static const struct i2c_device_id adau1977_i2c_ids[];



static int adau1977_i2c_probe(struct i2c_client *client)

{

	struct regmap_config config;

	const struct i2c_device_id *id = i2c_match_id(adau1977_i2c_ids, client);



	config = adau1977_regmap_config;

	config.val_bits = 8;
@@ -40,7 +42,7 @@ static struct i2c_driver adau1977_i2c_driver = { 
	.driver = {

		.name = "adau1977",

	},

	.probe = adau1977_i2c_probe,

	.probe_new = adau1977_i2c_probe,

	.id_table = adau1977_i2c_ids,

};

module_i2c_driver(adau1977_i2c_driver);

sound/soc/codecs/ssm2602-i2c.c

+5 −3
Original line number Diff line number Diff line
@@ -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);