* [PATCH v4 0/3] Match data improvements for wm8580 driver
@ 2023-09-01 6:59 Biju Das
2023-09-01 6:59 ` [PATCH v4 1/3] ASoC: wm8580: Simplify probe() Biju Das
` (3 more replies)
0 siblings, 4 replies; 11+ messages in thread
From: Biju Das @ 2023-09-01 6:59 UTC (permalink / raw)
To: Jaroslav Kysela, Takashi Iwai
Cc: Biju Das, Liam Girdwood, Mark Brown, Charles Keepax,
Uwe Kleine-König, Andy Shevchenko, patches, alsa-devel,
linux-kernel, Biju Das
This patch series aims to add match data improvements for wm8580 driver.
This patch series is only compile tested.
v3->v4:
* Created patch#2 for removing trailing comma in the terminator entry
for OF table.
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 (3):
ASoC: wm8580: Simplify probe()
ASoC: wm8580: Remove trailing comma in the terminator entry
ASoC: wm8580: Move OF table
sound/soc/codecs/wm8580.c | 26 ++++++++++----------------
1 file changed, 10 insertions(+), 16 deletions(-)
--
2.25.1
^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH v4 1/3] ASoC: wm8580: Simplify probe()
2023-09-01 6:59 [PATCH v4 0/3] Match data improvements for wm8580 driver Biju Das
@ 2023-09-01 6:59 ` Biju Das
2023-09-01 6:59 ` [PATCH v4 2/3] ASoC: wm8580: Remove trailing comma in the terminator entry Biju Das
` (2 subsequent siblings)
3 siblings, 0 replies; 11+ messages in thread
From: Biju Das @ 2023-09-01 6:59 UTC (permalink / raw)
To: Jaroslav Kysela, Takashi Iwai
Cc: Biju Das, Liam Girdwood, Mark Brown, Charles Keepax,
Uwe Kleine-König, Andy Shevchenko, patches, alsa-devel,
linux-kernel, Biju Das
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>
---
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
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v4 2/3] ASoC: wm8580: Remove trailing comma in the terminator entry
2023-09-01 6:59 [PATCH v4 0/3] Match data improvements for wm8580 driver Biju Das
2023-09-01 6:59 ` [PATCH v4 1/3] ASoC: wm8580: Simplify probe() Biju Das
@ 2023-09-01 6:59 ` Biju Das
2023-09-01 8:18 ` Charles Keepax
2023-09-01 8:53 ` Andy Shevchenko
2023-09-01 6:59 ` [PATCH v4 3/3] ASoC: wm8580: Move OF table Biju Das
2023-09-11 23:57 ` [PATCH v4 0/3] Match data improvements for wm8580 driver Mark Brown
3 siblings, 2 replies; 11+ messages in thread
From: Biju Das @ 2023-09-01 6:59 UTC (permalink / raw)
To: Jaroslav Kysela, Takashi Iwai
Cc: Biju Das, Liam Girdwood, Mark Brown, Charles Keepax,
Uwe Kleine-König, Andy Shevchenko, patches, alsa-devel,
linux-kernel, Biju Das
Remove trailing comma in the terminator entry for OF table.
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
---
v4:
* New patch
---
sound/soc/codecs/wm8580.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sound/soc/codecs/wm8580.c b/sound/soc/codecs/wm8580.c
index 826c39ec4a1e..ba47b01f13e7 100644
--- a/sound/soc/codecs/wm8580.c
+++ b/sound/soc/codecs/wm8580.c
@@ -991,7 +991,7 @@ static const struct wm8580_driver_data wm8581_data = {
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);
--
2.25.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [PATCH v4 3/3] ASoC: wm8580: Move OF table
2023-09-01 6:59 [PATCH v4 0/3] Match data improvements for wm8580 driver Biju Das
2023-09-01 6:59 ` [PATCH v4 1/3] ASoC: wm8580: Simplify probe() Biju Das
2023-09-01 6:59 ` [PATCH v4 2/3] ASoC: wm8580: Remove trailing comma in the terminator entry Biju Das
@ 2023-09-01 6:59 ` Biju Das
2023-09-01 8:18 ` Charles Keepax
2023-09-11 23:57 ` [PATCH v4 0/3] Match data improvements for wm8580 driver Mark Brown
3 siblings, 1 reply; 11+ messages in thread
From: Biju Das @ 2023-09-01 6:59 UTC (permalink / raw)
To: Jaroslav Kysela, Takashi Iwai
Cc: Biju Das, Liam Girdwood, Mark Brown, Charles Keepax,
Uwe Kleine-König, Andy Shevchenko, patches, alsa-devel,
linux-kernel, Biju Das
Move OF table near to the user.
Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
---
v3->v4:
* Created patch#2 for removing trailing comma in the terminator entry for
OF table.
v3:
* 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 ba47b01f13e7..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 },
--
2.25.1
^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH v4 2/3] ASoC: wm8580: Remove trailing comma in the terminator entry
2023-09-01 6:59 ` [PATCH v4 2/3] ASoC: wm8580: Remove trailing comma in the terminator entry Biju Das
@ 2023-09-01 8:18 ` Charles Keepax
2023-09-01 8:53 ` Andy Shevchenko
1 sibling, 0 replies; 11+ messages in thread
From: Charles Keepax @ 2023-09-01 8:18 UTC (permalink / raw)
To: Biju Das
Cc: Jaroslav Kysela, Takashi Iwai, Liam Girdwood, Mark Brown,
Uwe Kleine-König, Andy Shevchenko, patches, alsa-devel,
linux-kernel, Biju Das
On Fri, Sep 01, 2023 at 07:59:51AM +0100, Biju Das wrote:
> Remove trailing comma in the terminator entry for OF table.
>
> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> ---
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Thanks,
Charles
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v4 3/3] ASoC: wm8580: Move OF table
2023-09-01 6:59 ` [PATCH v4 3/3] ASoC: wm8580: Move OF table Biju Das
@ 2023-09-01 8:18 ` Charles Keepax
0 siblings, 0 replies; 11+ messages in thread
From: Charles Keepax @ 2023-09-01 8:18 UTC (permalink / raw)
To: Biju Das
Cc: Jaroslav Kysela, Takashi Iwai, Liam Girdwood, Mark Brown,
Uwe Kleine-König, Andy Shevchenko, patches, alsa-devel,
linux-kernel, Biju Das
On Fri, Sep 01, 2023 at 07:59:52AM +0100, Biju Das wrote:
> Move OF table near to the user.
>
> Signed-off-by: Biju Das <biju.das.jz@bp.renesas.com>
> ---
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Thanks,
Charles
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v4 2/3] ASoC: wm8580: Remove trailing comma in the terminator entry
2023-09-01 6:59 ` [PATCH v4 2/3] ASoC: wm8580: Remove trailing comma in the terminator entry Biju Das
2023-09-01 8:18 ` Charles Keepax
@ 2023-09-01 8:53 ` Andy Shevchenko
2023-09-01 12:54 ` Mark Brown
1 sibling, 1 reply; 11+ messages in thread
From: Andy Shevchenko @ 2023-09-01 8:53 UTC (permalink / raw)
To: Biju Das
Cc: Jaroslav Kysela, Takashi Iwai, Liam Girdwood, Mark Brown,
Charles Keepax, Uwe Kleine-König, patches, alsa-devel,
linux-kernel, Biju Das
On Fri, Sep 01, 2023 at 07:59:51AM +0100, Biju Das wrote:
> Remove trailing comma in the terminator entry for OF table.
You are so fast :-)
This will produce an unneeded churn as you touch the same line twice in a row.
Just combine them and mention both changes in the commit message.
With that done,
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v4 2/3] ASoC: wm8580: Remove trailing comma in the terminator entry
2023-09-01 8:53 ` Andy Shevchenko
@ 2023-09-01 12:54 ` Mark Brown
2023-09-01 13:19 ` Andy Shevchenko
0 siblings, 1 reply; 11+ messages in thread
From: Mark Brown @ 2023-09-01 12:54 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Biju Das, Jaroslav Kysela, Takashi Iwai, Liam Girdwood,
Charles Keepax, Uwe Kleine-König, patches, alsa-devel,
linux-kernel, Biju Das
[-- Attachment #1: Type: text/plain, Size: 362 bytes --]
On Fri, Sep 01, 2023 at 11:53:29AM +0300, Andy Shevchenko wrote:
> On Fri, Sep 01, 2023 at 07:59:51AM +0100, Biju Das wrote:
> > Remove trailing comma in the terminator entry for OF table.
> You are so fast :-)
> This will produce an unneeded churn as you touch the same line twice in a row.
So do reviews which focus on very pedantic issues like this one...
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v4 2/3] ASoC: wm8580: Remove trailing comma in the terminator entry
2023-09-01 12:54 ` Mark Brown
@ 2023-09-01 13:19 ` Andy Shevchenko
2023-09-01 13:33 ` Mark Brown
0 siblings, 1 reply; 11+ messages in thread
From: Andy Shevchenko @ 2023-09-01 13:19 UTC (permalink / raw)
To: Mark Brown
Cc: Biju Das, Jaroslav Kysela, Takashi Iwai, Liam Girdwood,
Charles Keepax, Uwe Kleine-König, patches, alsa-devel,
linux-kernel, Biju Das
On Fri, Sep 01, 2023 at 01:54:58PM +0100, Mark Brown wrote:
> On Fri, Sep 01, 2023 at 11:53:29AM +0300, Andy Shevchenko wrote:
> > On Fri, Sep 01, 2023 at 07:59:51AM +0100, Biju Das wrote:
>
> > > Remove trailing comma in the terminator entry for OF table.
>
> > You are so fast :-)
> > This will produce an unneeded churn as you touch the same line twice in a row.
>
> So do reviews which focus on very pedantic issues like this one...
If you fine with a series as is, take it!
It's really nothing to bikeshed about.
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v4 2/3] ASoC: wm8580: Remove trailing comma in the terminator entry
2023-09-01 13:19 ` Andy Shevchenko
@ 2023-09-01 13:33 ` Mark Brown
0 siblings, 0 replies; 11+ messages in thread
From: Mark Brown @ 2023-09-01 13:33 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Biju Das, Jaroslav Kysela, Takashi Iwai, Liam Girdwood,
Charles Keepax, Uwe Kleine-König, patches, alsa-devel,
linux-kernel, Biju Das
[-- Attachment #1: Type: text/plain, Size: 699 bytes --]
On Fri, Sep 01, 2023 at 04:19:50PM +0300, Andy Shevchenko wrote:
> On Fri, Sep 01, 2023 at 01:54:58PM +0100, Mark Brown wrote:
> > So do reviews which focus on very pedantic issues like this one...
> If you fine with a series as is, take it!
We are in the merge window right now so if I queue things I won't
actually apply them until the merge window is closed, meaning I need to
keep track of what's queued already when new versions come in or
whatever.
> It's really nothing to bikeshed about.
Well, quite. What I do for these very minor issues if I do end up
commenting on them is mention them but explicitly say that the comment
is more for future reference and there's no need to resend.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH v4 0/3] Match data improvements for wm8580 driver
2023-09-01 6:59 [PATCH v4 0/3] Match data improvements for wm8580 driver Biju Das
` (2 preceding siblings ...)
2023-09-01 6:59 ` [PATCH v4 3/3] ASoC: wm8580: Move OF table Biju Das
@ 2023-09-11 23:57 ` Mark Brown
3 siblings, 0 replies; 11+ messages in thread
From: Mark Brown @ 2023-09-11 23:57 UTC (permalink / raw)
To: Jaroslav Kysela, Takashi Iwai, Biju Das
Cc: Liam Girdwood, Charles Keepax, Uwe Kleine-König,
Andy Shevchenko, patches, alsa-devel, linux-kernel, Biju Das
On Fri, 01 Sep 2023 07:59:49 +0100, Biju Das wrote:
> This patch series aims to add match data improvements for wm8580 driver.
>
> This patch series is only compile tested.
>
> v3->v4:
> * Created patch#2 for removing trailing comma in the terminator entry
> for OF table.
> 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
>
> [...]
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/3] ASoC: wm8580: Simplify probe()
commit: 26eacb98ca7dd3ba5a6845028a13d13a7f03123f
[2/3] ASoC: wm8580: Remove trailing comma in the terminator entry
commit: aa11a78fecab8809167dcb59dd3f55b5fdbc9ef3
[3/3] ASoC: wm8580: Move OF table
commit: ef01a6dec7f1717d13282e84bb4ac68f2119d9d9
All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying
to this mail.
Thanks,
Mark
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2023-09-12 4:11 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-09-01 6:59 [PATCH v4 0/3] Match data improvements for wm8580 driver Biju Das
2023-09-01 6:59 ` [PATCH v4 1/3] ASoC: wm8580: Simplify probe() Biju Das
2023-09-01 6:59 ` [PATCH v4 2/3] ASoC: wm8580: Remove trailing comma in the terminator entry Biju Das
2023-09-01 8:18 ` Charles Keepax
2023-09-01 8:53 ` Andy Shevchenko
2023-09-01 12:54 ` Mark Brown
2023-09-01 13:19 ` Andy Shevchenko
2023-09-01 13:33 ` Mark Brown
2023-09-01 6:59 ` [PATCH v4 3/3] ASoC: wm8580: Move OF table Biju Das
2023-09-01 8:18 ` Charles Keepax
2023-09-11 23:57 ` [PATCH v4 0/3] Match data improvements for wm8580 driver Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.