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

ASoC: ak*: 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>
Link: https://lore.kernel.org/r/20220415160613.148882-2-steve@sk2.org


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

sound/soc/codecs/ak4613.c

+6 −4
Original line number Diff line number Diff line
@@ -876,8 +876,7 @@ static void ak4613_parse_of(struct ak4613_priv *priv, 
	AK4613_CONFIG_SDTI_set(priv, sdti_num);

}



static int ak4613_i2c_probe(struct i2c_client *i2c,

			    const struct i2c_device_id *id)

static int ak4613_i2c_probe(struct i2c_client *i2c)

{

	struct device *dev = &i2c->dev;

	struct device_node *np = dev->of_node;
@@ -888,8 +887,11 @@ static int ak4613_i2c_probe(struct i2c_client *i2c, 
	regmap_cfg = NULL;

	if (np)

		regmap_cfg = of_device_get_match_data(dev);

	else

	else {

		const struct i2c_device_id *id =

			i2c_match_id(ak4613_i2c_id, i2c);

		regmap_cfg = (const struct regmap_config *)id->driver_data;

	}



	if (!regmap_cfg)

		return -EINVAL;
@@ -927,7 +929,7 @@ static struct i2c_driver ak4613_i2c_driver = { 
		.name = "ak4613-codec",

		.of_match_table = ak4613_of_match,

	},

	.probe		= ak4613_i2c_probe,

	.probe_new	= ak4613_i2c_probe,

	.remove		= ak4613_i2c_remove,

	.id_table	= ak4613_i2c_id,

};

sound/soc/codecs/ak4642.c

+5 −3
Original line number Diff line number Diff line
@@ -630,8 +630,8 @@ static struct clk *ak4642_of_parse_mcko(struct device *dev) 
#endif



static const struct of_device_id ak4642_of_match[];

static int ak4642_i2c_probe(struct i2c_client *i2c,

			    const struct i2c_device_id *id)

static const struct i2c_device_id ak4642_i2c_id[];

static int ak4642_i2c_probe(struct i2c_client *i2c)

{

	struct device *dev = &i2c->dev;

	struct device_node *np = dev->of_node;
@@ -651,6 +651,8 @@ static int ak4642_i2c_probe(struct i2c_client *i2c, 
		if (of_id)

			drvdata = of_id->data;

	} else {

		const struct i2c_device_id *id =

			i2c_match_id(ak4642_i2c_id, i2c);

		drvdata = (const struct ak4642_drvdata *)id->driver_data;

	}
@@ -697,7 +699,7 @@ static struct i2c_driver ak4642_i2c_driver = { 
		.name = "ak4642-codec",

		.of_match_table = ak4642_of_match,

	},

	.probe		= ak4642_i2c_probe,

	.probe_new	= ak4642_i2c_probe,

	.id_table	= ak4642_i2c_id,

};