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: Biju Das <[email protected]>
Acked-by: Charles Keepax <[email protected]>
Reviewed-by: Andy Shevchenko <[email protected]>
---
v3->v4:
* No change.
v2->v3:
* Added Rb tag from Andy.
* Restored OF table postion and moved in patch#2
v1->v2:
* Added Ack from Charles Keepax.
* Removed comma in the terminator entry.
* Restored original error code -EINVAL
---
sound/soc/codecs/wm8580.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c
index 6d22f7d40ec2..826c39ec4a1e 100644
--- a/sound/soc/codecs/wm8580.c
+++ b/sound/soc/codecs/wm8580.c
@@ -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));
--
2.25.1