Unverified Commit bc07df94 authored by Biju Das's avatar Biju Das Committed by Mark Brown
Browse files

ASoC: wm8580: Simplify probe() 



Simplify probe() by replacing of_match_device->i2c_get_match_data()
and extend matching support for ID table.

While at it, remove comma in the terminator entry and simplify probe()
by replacing dev_err()->dev_err_probe().

Signed-off-by: default avatarBiju Das <biju.das.jz@bp.renesas.com>
Acked-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Reviewed-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20230901065952.18760-2-biju.das.jz@bp.renesas.com


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

sound/soc/codecs/wm8580.c

+3 −9
Original line number Diff line number Diff line
@@ -997,7 +997,6 @@ MODULE_DEVICE_TABLE(of, wm8580_of_match); 


static int wm8580_i2c_probe(struct i2c_client *i2c)

{

	const struct of_device_id *of_id;

	struct wm8580_priv *wm8580;

	int ret, i;
@@ -1022,14 +1021,9 @@ static int wm8580_i2c_probe(struct i2c_client *i2c) 


	i2c_set_clientdata(i2c, wm8580);



	of_id = of_match_device(wm8580_of_match, &i2c->dev);

	if (of_id)

		wm8580->drvdata = of_id->data;



	if (!wm8580->drvdata) {

		dev_err(&i2c->dev, "failed to find driver data\n");

		return -EINVAL;

	}

	wm8580->drvdata = i2c_get_match_data(i2c);

	if (!wm8580->drvdata)

		return dev_err_probe(&i2c->dev, -EINVAL, "failed to find driver data\n");



	ret = devm_snd_soc_register_component(&i2c->dev,

			&soc_component_dev_wm8580, wm8580_dai, ARRAY_SIZE(wm8580_dai));