[PATCH v3 0/2] Match data improvements for wm8580 driver
This patch series aims to add match data improvements for wm8580 driver.
This patch series is only compile tested.
v2->v3: * Added Rb tag from Andy. * Restored OF table postion and moved in patch#2 * Moved OF table near to the user. v1->v2: * Added Ack from Charles Keepax. * Removed comma in the terminator entry. * Restored original error code -EINVAL
Biju Das (2): ASoC: wm8580: Simplify probe() ASoC: wm8580: Move OF table
sound/soc/codecs/wm8580.c | 26 ++++++++++---------------- 1 file changed, 10 insertions(+), 16 deletions(-)
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 biju.das.jz@bp.renesas.com Acked-by: Charles Keepax ckeepax@opensource.cirrus.com Reviewed-by: Andy Shevchenko andriy.shevchenko@linux.intel.com --- 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));
Move OF table near to the user.
Signed-off-by: Biju Das biju.das.jz@bp.renesas.com --- v2: * New patch. --- sound/soc/codecs/wm8580.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c index 826c39ec4a1e..28c0ba348634 100644 --- a/sound/soc/codecs/wm8580.c +++ b/sound/soc/codecs/wm8580.c @@ -988,13 +988,6 @@ static const struct wm8580_driver_data wm8581_data = { .num_dacs = 4, };
-static const struct of_device_id wm8580_of_match[] = { - { .compatible = "wlf,wm8580", .data = &wm8580_data }, - { .compatible = "wlf,wm8581", .data = &wm8581_data }, - { }, -}; -MODULE_DEVICE_TABLE(of, wm8580_of_match); - static int wm8580_i2c_probe(struct i2c_client *i2c) { struct wm8580_priv *wm8580; @@ -1031,6 +1024,13 @@ static int wm8580_i2c_probe(struct i2c_client *i2c) return ret; }
+static const struct of_device_id wm8580_of_match[] = { + { .compatible = "wlf,wm8580", .data = &wm8580_data }, + { .compatible = "wlf,wm8581", .data = &wm8581_data }, + { } +}; +MODULE_DEVICE_TABLE(of, wm8580_of_match); + static const struct i2c_device_id wm8580_i2c_id[] = { { "wm8580", (kernel_ulong_t)&wm8580_data }, { "wm8581", (kernel_ulong_t)&wm8581_data },
Hi Andy,
Subject: Re: [PATCH v3 2/2] ASoC: wm8580: Move OF table
On Thu, Aug 31, 2023 at 09:14:29PM +0100, Biju Das wrote:
Move OF table near to the user.
It does a bit more that that.
OK I will send separate patch for removing trailing comma in terminator.
Cheers, Biju
On Fri, Sep 01, 2023 at 06:33:08AM +0000, Biju Das wrote:
Hi Andy,
Subject: Re: [PATCH v3 2/2] ASoC: wm8580: Move OF table
On Thu, Aug 31, 2023 at 09:14:29PM +0100, Biju Das wrote:
Move OF table near to the user.
It does a bit more that that.
OK I will send separate patch for removing trailing comma in terminator.
It's fine to have them in a single patch as they are kinda related (since you touch the lines anyway). My point is that this change also needs to be described in the commit message.
participants (2)
-
Andy Shevchenko -
Biju Das