* [PATCH 1/4] ASoC: max98373: Fix return check for devm_regmap_init_sdw()
@ 2020-08-26 12:28 Vinod Koul
2020-08-26 12:28 ` [PATCH 2/4] ASoC: rt1308-sdw: " Vinod Koul
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Vinod Koul @ 2020-08-26 12:28 UTC (permalink / raw)
To: Mark Brown
Cc: Vinod Koul, Takashi Iwai, Pierre-Louis Bossart, Ryan Lee,
Kai Vehmanen, Rander Wang, Naveen Manohar, alsa-devel,
linux-kernel, Takashi Iwai
devm_regmap_init_sdw() returns a valid pointer on success or ERR_PTR on
failure which should be checked with IS_ERR. Also use PTR_ERR for
returning error codes.
Reported-by: Takashi Iwai <tiwai@suse.de>
Fixes: 56a5b7910e96 ("ASoC: codecs: max98373: add SoundWire support")
Signed-off-by: Vinod Koul <vkoul@kernel.org>
---
sound/soc/codecs/max98373-sdw.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/max98373-sdw.c b/sound/soc/codecs/max98373-sdw.c
index 5fe724728e84..e4675cfff7b2 100644
--- a/sound/soc/codecs/max98373-sdw.c
+++ b/sound/soc/codecs/max98373-sdw.c
@@ -838,8 +838,8 @@ static int max98373_sdw_probe(struct sdw_slave *slave,
/* Regmap Initialization */
regmap = devm_regmap_init_sdw(slave, &max98373_sdw_regmap);
- if (!regmap)
- return -EINVAL;
+ if (IS_ERR(regmap))
+ return PTR_ERR(regmap);
return max98373_init(slave, regmap);
}
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/4] ASoC: rt1308-sdw: Fix return check for devm_regmap_init_sdw()
2020-08-26 12:28 [PATCH 1/4] ASoC: max98373: Fix return check for devm_regmap_init_sdw() Vinod Koul
@ 2020-08-26 12:28 ` Vinod Koul
2020-08-26 12:28 ` Vinod Koul
2020-08-26 12:28 ` [PATCH 4/4] ASoC: rt715: " Vinod Koul
2 siblings, 0 replies; 6+ messages in thread
From: Vinod Koul @ 2020-08-26 12:28 UTC (permalink / raw)
To: Mark Brown
Cc: Vinod Koul, Takashi Iwai, Pierre-Louis Bossart, alsa-devel,
linux-kernel, Oder Chiou, Shuming Fan, Takashi Iwai
devm_regmap_init_sdw() returns a valid pointer on success or ERR_PTR on
failure which should be checked with IS_ERR. Also use PTR_ERR for
returning error codes.
Reported-by: Takashi Iwai <tiwai@suse.de>
Fixes: a87a6653a28c ("ASoC: rt1308-sdw: add rt1308 SdW amplifier driver")
Signed-off-by: Vinod Koul <vkoul@kernel.org>
---
sound/soc/codecs/rt1308-sdw.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/rt1308-sdw.c b/sound/soc/codecs/rt1308-sdw.c
index b0ba0d2acbdd..56e952a904a3 100644
--- a/sound/soc/codecs/rt1308-sdw.c
+++ b/sound/soc/codecs/rt1308-sdw.c
@@ -684,8 +684,8 @@ static int rt1308_sdw_probe(struct sdw_slave *slave,
/* Regmap Initialization */
regmap = devm_regmap_init_sdw(slave, &rt1308_sdw_regmap);
- if (!regmap)
- return -EINVAL;
+ if (IS_ERR(regmap))
+ return PTR_ERR(regmap);
rt1308_sdw_init(&slave->dev, regmap, slave);
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/4] ASoC: rt1308-sdw: Fix return check for devm_regmap_init_sdw()
2020-08-26 12:28 [PATCH 1/4] ASoC: max98373: Fix return check for devm_regmap_init_sdw() Vinod Koul
2020-08-26 12:28 ` [PATCH 2/4] ASoC: rt1308-sdw: " Vinod Koul
@ 2020-08-26 12:28 ` Vinod Koul
2020-08-26 12:28 ` [PATCH 4/4] ASoC: rt715: " Vinod Koul
2 siblings, 0 replies; 6+ messages in thread
From: Vinod Koul @ 2020-08-26 12:28 UTC (permalink / raw)
To: Mark Brown
Cc: Vinod Koul, Takashi Iwai, Pierre-Louis Bossart, alsa-devel,
linux-kernel, Oder Chiou, Shuming Fan, Takashi Iwai
devm_regmap_init_sdw() returns a valid pointer on success or ERR_PTR on
failure which should be checked with IS_ERR. Also use PTR_ERR for
Date: Wed, 26 Aug 2020 17:45:58 +0530
Subject: [PATCH 3/4] ASoC: rt711: Fix return check for devm_regmap_init_sdw()
devm_regmap_init_sdw() returns a valid pointer on success or ERR_PTR on
failure which should be checked with IS_ERR. Also use PTR_ERR for
returning error codes.
Reported-by: Takashi Iwai <tiwai@suse.de>
Fixes: 320b8b0d13b8 ("ASoC: rt711: add rt711 codec driver")
Signed-off-by: Vinod Koul <vkoul@kernel.org>
---
sound/soc/codecs/rt711-sdw.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/rt711-sdw.c b/sound/soc/codecs/rt711-sdw.c
index 45b928954b58..7efff130a638 100644
--- a/sound/soc/codecs/rt711-sdw.c
+++ b/sound/soc/codecs/rt711-sdw.c
@@ -452,8 +452,8 @@ static int rt711_sdw_probe(struct sdw_slave *slave,
/* Regmap Initialization */
sdw_regmap = devm_regmap_init_sdw(slave, &rt711_sdw_regmap);
- if (!sdw_regmap)
- return -EINVAL;
+ if (IS_ERR(sdw_regmap))
+ return PTR_ERR(sdw_regmap);
regmap = devm_regmap_init(&slave->dev, NULL,
&slave->dev, &rt711_regmap);
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 4/4] ASoC: rt715: Fix return check for devm_regmap_init_sdw()
2020-08-26 12:28 [PATCH 1/4] ASoC: max98373: Fix return check for devm_regmap_init_sdw() Vinod Koul
2020-08-26 12:28 ` [PATCH 2/4] ASoC: rt1308-sdw: " Vinod Koul
2020-08-26 12:28 ` Vinod Koul
@ 2020-08-26 12:28 ` Vinod Koul
2020-08-26 15:09 ` Pierre-Louis Bossart
2 siblings, 1 reply; 6+ messages in thread
From: Vinod Koul @ 2020-08-26 12:28 UTC (permalink / raw)
To: Mark Brown
Cc: Vinod Koul, Takashi Iwai, Pierre-Louis Bossart, alsa-devel,
linux-kernel, Oder Chiou, Shuming Fan, Takashi Iwai
devm_regmap_init_sdw() returns a valid pointer on success or ERR_PTR on
failure which should be checked with IS_ERR. Also use PTR_ERR for
returning error codes.
Reported-by: Takashi Iwai <tiwai@suse.de>
Fixes: d1ede0641b05 ("ASoC: rt715: add RT715 codec driver")
Signed-off-by: Vinod Koul <vkoul@kernel.org>
---
sound/soc/codecs/rt715-sdw.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sound/soc/codecs/rt715-sdw.c b/sound/soc/codecs/rt715-sdw.c
index d11b23d6b240..68a36739f1b0 100644
--- a/sound/soc/codecs/rt715-sdw.c
+++ b/sound/soc/codecs/rt715-sdw.c
@@ -527,8 +527,8 @@ static int rt715_sdw_probe(struct sdw_slave *slave,
/* Regmap Initialization */
sdw_regmap = devm_regmap_init_sdw(slave, &rt715_sdw_regmap);
- if (!sdw_regmap)
- return -EINVAL;
+ if (IS_ERR(sdw_regmap))
+ return PTR_ERR(sdw_regmap);
regmap = devm_regmap_init(&slave->dev, NULL, &slave->dev,
&rt715_regmap);
--
2.26.2
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [PATCH 4/4] ASoC: rt715: Fix return check for devm_regmap_init_sdw()
2020-08-26 12:28 ` [PATCH 4/4] ASoC: rt715: " Vinod Koul
@ 2020-08-26 15:09 ` Pierre-Louis Bossart
2020-08-26 16:21 ` Vinod Koul
0 siblings, 1 reply; 6+ messages in thread
From: Pierre-Louis Bossart @ 2020-08-26 15:09 UTC (permalink / raw)
To: Vinod Koul, Mark Brown
Cc: Takashi Iwai, alsa-devel, linux-kernel, Oder Chiou, Shuming Fan,
Takashi Iwai
On 8/26/20 7:28 AM, Vinod Koul wrote:
> devm_regmap_init_sdw() returns a valid pointer on success or ERR_PTR on
> failure which should be checked with IS_ERR. Also use PTR_ERR for
> returning error codes.
Do you mind changing these two additional codecs that were missed in
this series? Thanks!
rt700-sdw.c: sdw_regmap = devm_regmap_init_sdw(slave, &rt700_sdw_regmap);
rt700-sdw.c- if (!sdw_regmap)
rt700-sdw.c- return -EINVAL;
--
rt711-sdw.c: sdw_regmap = devm_regmap_init_sdw(slave, &rt711_sdw_regmap);
rt711-sdw.c- if (!sdw_regmap)
rt711-sdw.c- return -EINVAL;
--
>
> Reported-by: Takashi Iwai <tiwai@suse.de>
> Fixes: d1ede0641b05 ("ASoC: rt715: add RT715 codec driver")
> Signed-off-by: Vinod Koul <vkoul@kernel.org>
> ---
> sound/soc/codecs/rt715-sdw.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/sound/soc/codecs/rt715-sdw.c b/sound/soc/codecs/rt715-sdw.c
> index d11b23d6b240..68a36739f1b0 100644
> --- a/sound/soc/codecs/rt715-sdw.c
> +++ b/sound/soc/codecs/rt715-sdw.c
> @@ -527,8 +527,8 @@ static int rt715_sdw_probe(struct sdw_slave *slave,
>
> /* Regmap Initialization */
> sdw_regmap = devm_regmap_init_sdw(slave, &rt715_sdw_regmap);
> - if (!sdw_regmap)
> - return -EINVAL;
> + if (IS_ERR(sdw_regmap))
> + return PTR_ERR(sdw_regmap);
>
> regmap = devm_regmap_init(&slave->dev, NULL, &slave->dev,
> &rt715_regmap);
>
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 4/4] ASoC: rt715: Fix return check for devm_regmap_init_sdw()
2020-08-26 15:09 ` Pierre-Louis Bossart
@ 2020-08-26 16:21 ` Vinod Koul
0 siblings, 0 replies; 6+ messages in thread
From: Vinod Koul @ 2020-08-26 16:21 UTC (permalink / raw)
To: Pierre-Louis Bossart
Cc: Mark Brown, Takashi Iwai, alsa-devel, linux-kernel, Oder Chiou,
Shuming Fan, Takashi Iwai
On 26-08-20, 10:09, Pierre-Louis Bossart wrote:
>
>
> On 8/26/20 7:28 AM, Vinod Koul wrote:
> > devm_regmap_init_sdw() returns a valid pointer on success or ERR_PTR on
> > failure which should be checked with IS_ERR. Also use PTR_ERR for
> > returning error codes.
>
> Do you mind changing these two additional codecs that were missed in this
> series? Thanks!
>
> rt700-sdw.c: sdw_regmap = devm_regmap_init_sdw(slave, &rt700_sdw_regmap);
> rt700-sdw.c- if (!sdw_regmap)
> rt700-sdw.c- return -EINVAL;
Yes missed this one
>
> --
> rt711-sdw.c: sdw_regmap = devm_regmap_init_sdw(slave, &rt711_sdw_regmap);
> rt711-sdw.c- if (!sdw_regmap)
> rt711-sdw.c- return -EINVAL;
And somehow patch series is messed, I have two 2/4 but no 3/4 which
patches rt711-sdw.c, will send v2 with these fixed
--
~Vinod
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2020-08-26 16:21 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-26 12:28 [PATCH 1/4] ASoC: max98373: Fix return check for devm_regmap_init_sdw() Vinod Koul
2020-08-26 12:28 ` [PATCH 2/4] ASoC: rt1308-sdw: " Vinod Koul
2020-08-26 12:28 ` Vinod Koul
2020-08-26 12:28 ` [PATCH 4/4] ASoC: rt715: " Vinod Koul
2020-08-26 15:09 ` Pierre-Louis Bossart
2020-08-26 16:21 ` Vinod Koul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox