Skip to contentSkip to conversation

ASoC: fsl_spdif: don't print EPROBE_DEFER as error

PATCH In review Stefan Agner 4 participants 16 messages Jan 17, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH 1/5 ASoC: fsl_spdif: don't print EPROBE_DEFER as error

Probe deferral is to be expected during normal operation, so avoid printing an error when it is encountered.

---
 sound/soc/fsl/fsl_spdif.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/fsl/fsl_spdif.c +1 -1
index 740b90df44bb..a26686e7281c 100644
@@ -1320,7 +1320,7 @@ static int fsl_spdif_probe(struct platform_device *pdev)
 	}
 
 	ret = imx_pcm_dma_init(pdev, IMX_SPDIF_DMABUF_SIZE);
-	if (ret)
+	if (ret && ret != -EPROBE_DEFER)
 		dev_err(&pdev->dev, "imx_pcm_dma_init failed: %d\n", ret);
 
 	return ret;
Signature · 1 line
2.20.1
#1 lore raw

PATCH 2/5 ASoC: imx-spdif: don't print EPROBE_DEFER as error

Probe deferral is to be expected during normal operation, so avoid printing an error when it is encountered.

Removing the goto would not be strictly necessary. However, if code gets added later, the cleanup in the EPROBE_DEFER case likely would get missed.

---
 sound/soc/fsl/imx-spdif.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
sound/soc/fsl/imx-spdif.c +1 -3
index fb896b2c9ba3..797d66e43d49 100644
@@ -67,10 +67,8 @@ static int imx_spdif_audio_probe(struct platform_device *pdev)
 		goto end;
 
 	ret = devm_snd_soc_register_card(&pdev->dev, &data->card);
-	if (ret) {
+	if (ret && ret != -EPROBE_DEFER)
 		dev_err(&pdev->dev, "snd_soc_register_card failed: %d\n", ret);
-		goto end;
-	}
 
 end:
 	of_node_put(spdif_np);
Signature · 1 line
2.20.1
Reviewed-by on v1 2/5
#2 lore raw

Re: [alsa-devel] [PATCH 2/5] ASoC: imx-spdif: don't print EPROBE_DEFER as error

Quoted 9 lines · Stefan Agner

Probe deferral is to be expected during normal operation, so avoid printing an error when it is encountered.

Removing the goto would not be strictly necessary. However, if code gets added later, the cleanup in the EPROBE_DEFER case likely would get missed.

reviewer Acked-by on v1 2/5
#3 lore raw

Re: [PATCH 2/5] ASoC: imx-spdif: don't print EPROBE_DEFER as error

In reply to Stefan Agner
Quoted 3 lines · Stefan Agner

Removing the goto would not be strictly necessary. However, if code gets added later, the cleanup in the EPROBE_DEFER case likely would get missed.

Considering there is no code being added between them over the years, I am okay to remove it since it makes things clean. But as you mentioned, we gotta be careful if code gets added later.

Quoted 1 line
Quoted 23 lines
---
 sound/soc/fsl/imx-spdif.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
sound/soc/fsl/imx-spdif.c +1 -3
index fb896b2c9ba3..797d66e43d49 100644
@@ -67,10 +67,8 @@ static int imx_spdif_audio_probe(struct platform_device *pdev)
 		goto end;
 
 	ret = devm_snd_soc_register_card(&pdev->dev, &data->card);
-	if (ret) {
+	if (ret && ret != -EPROBE_DEFER)
 		dev_err(&pdev->dev, "snd_soc_register_card failed: %d\n", ret);
-		goto end;
-	}
 
 end:
 	of_node_put(spdif_np);
Signature · 1 line
2.20.1
#4 lore raw

PATCH 3/5 ASoC: imx-sgtl5000: don't print EPROBE_DEFER as error

In reply to Stefan Agner

Probe deferral is to be expected during normal operation, so avoid printing an error when it is encountered.

---
 sound/soc/fsl/imx-sgtl5000.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/fsl/imx-sgtl5000.c +3 -1
index c29200cf755a..e1e20499b2f1 100644
@@ -156,7 +156,9 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
 
 	ret = devm_snd_soc_register_card(&pdev->dev, &data->card);
 	if (ret) {
-		dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
+		if (ret != -EPROBE_DEFER)
+			dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n",
+				ret);
 		goto fail;
 	}
 
Signature · 1 line
2.20.1
Reviewed-by on v1 3/5
#5 lore raw

Re: [alsa-devel] [PATCH 3/5] ASoC: imx-sgtl5000: don't print EPROBE_DEFER as error

Quoted 5 lines · Stefan Agner

Probe deferral is to be expected during normal operation, so avoid printing an error when it is encountered.

Quoted 26 lines
---
 sound/soc/fsl/imx-sgtl5000.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/fsl/imx-sgtl5000.c +3 -2
index c29200cf755a..e1e20499b2f1 100644
@@ -156,7 +156,9 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
 
        ret = devm_snd_soc_register_card(&pdev->dev, &data->card);
        if (ret) {
-               dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
+               if (ret != -EPROBE_DEFER)
+                       dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n",
+                               ret);
                goto fail;
        }
 
--

2.20.1

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

reviewer Acked-by on v1 3/5
#6 lore raw

Re: [PATCH 3/5] ASoC: imx-sgtl5000: don't print EPROBE_DEFER as error

In reply to Stefan Agner
Quoted 4 lines · Stefan Agner

Probe deferral is to be expected during normal operation, so avoid printing an error when it is encountered.

Quoted 22 lines
---
 sound/soc/fsl/imx-sgtl5000.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/fsl/imx-sgtl5000.c +3 -1
index c29200cf755a..e1e20499b2f1 100644
@@ -156,7 +156,9 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
 
 	ret = devm_snd_soc_register_card(&pdev->dev, &data->card);
 	if (ret) {
-		dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n", ret);
+		if (ret != -EPROBE_DEFER)
+			dev_err(&pdev->dev, "snd_soc_register_card failed (%d)\n",
+				ret);
 		goto fail;
 	}
 
Signature · 1 line
2.20.1
#7 lore raw

PATCH 4/5 ASoC: imx-sgtl5000: put of nodes if finding codec fails

In reply to Stefan Agner

Make sure to properly put the of node in case finding the codec fails.

Fixes 81e8e4926167 ("ASoC: fsl: add sgtl5000 clock support for imx-sgtl5000")
---
 sound/soc/fsl/imx-sgtl5000.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/fsl/imx-sgtl5000.c +2 -1
index e1e20499b2f1..45969e6dfad7 100644
@@ -111,7 +111,8 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
 	codec_dev = of_find_i2c_device_by_node(codec_np);
 	if (!codec_dev) {
 		dev_err(&pdev->dev, "failed to find codec platform device\n");
-		return -EPROBE_DEFER;
+		ret = -EPROBE_DEFER;
+		goto fail;
 	}
 
 	data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
Signature · 1 line
2.20.1
Reviewed-by on v1 4/5
#8 lore raw

Re: [alsa-devel] [PATCH 4/5] ASoC: imx-sgtl5000: put of nodes if finding codec fails

Quoted 6 lines · Stefan Agner

Make sure to properly put the of node in case finding the codec fails.

Fixes 81e8e4926167 ("ASoC: fsl: add sgtl5000 clock support for imx-sgtl5000")
Quoted 25 lines
---
 sound/soc/fsl/imx-sgtl5000.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/fsl/imx-sgtl5000.c +2 -2
index e1e20499b2f1..45969e6dfad7 100644
@@ -111,7 +111,8 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
        codec_dev = of_find_i2c_device_by_node(codec_np);
        if (!codec_dev) {
                dev_err(&pdev->dev, "failed to find codec platform device\n");
-               return -EPROBE_DEFER;
+               ret = -EPROBE_DEFER;
+               goto fail;
        }
 
        data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
--

2.20.1

_______________________________________________
Alsa-devel mailing list
[email protected]
http://mailman.alsa-project.org/mailman/listinfo/alsa-devel

reviewer
#9 lore raw

Re: [alsa-devel] [PATCH 4/5] ASoC: imx-sgtl5000: put of nodes if finding codec fails

In reply to Stefan Agner

Hi Stefan,

Quoted 6 lines · Stefan Agner

Make sure to properly put the of node in case finding the codec fails.

Fixes 81e8e4926167 ("ASoC: fsl: add sgtl5000 clock support for imx-sgtl5000")

Looks good.

I would suggest making this patch the first one of the series, since it is a bug fix and could potentially be applied to stable.

Thanks

reviewer Acked-by on v1 4/5
#10 lore raw

Re: [PATCH 4/5] ASoC: imx-sgtl5000: put of nodes if finding codec fails

In reply to Stefan Agner
Quoted 5 lines · Stefan Agner

Make sure to properly put the of node in case finding the codec fails.

Fixes 81e8e4926167 ("ASoC: fsl: add sgtl5000 clock support for imx-sgtl5000")
Quoted 21 lines
---
 sound/soc/fsl/imx-sgtl5000.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
sound/soc/fsl/imx-sgtl5000.c +2 -1
index e1e20499b2f1..45969e6dfad7 100644
@@ -111,7 +111,8 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
 	codec_dev = of_find_i2c_device_by_node(codec_np);
 	if (!codec_dev) {
 		dev_err(&pdev->dev, "failed to find codec platform device\n");
-		return -EPROBE_DEFER;
+		ret = -EPROBE_DEFER;
+		goto fail;
 	}
 
 	data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL);
Signature · 1 line
2.20.1
#11 lore raw

PATCH 5/5 ASoC: imx-sgtl5000: lower log level for potential probe deferral cases

In reply to Stefan Agner

Not finding the codec/SSI instance can be due to probe deferral. Do not print error messages in those cases.

---
 sound/soc/fsl/imx-sgtl5000.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/fsl/imx-sgtl5000.c +2 -2
index 45969e6dfad7..b6cb80480b60 100644
@@ -104,13 +104,13 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
 
 	ssi_pdev = of_find_device_by_node(ssi_np);
 	if (!ssi_pdev) {
-		dev_err(&pdev->dev, "failed to find SSI platform device\n");
+		dev_dbg(&pdev->dev, "failed to find SSI platform device\n");
 		ret = -EPROBE_DEFER;
 		goto fail;
 	}
 	codec_dev = of_find_i2c_device_by_node(codec_np);
 	if (!codec_dev) {
-		dev_err(&pdev->dev, "failed to find codec platform device\n");
+		dev_dbg(&pdev->dev, "failed to find codec platform device\n");
 		ret = -EPROBE_DEFER;
 		goto fail;
 	}
Signature · 1 line
2.20.1
reviewer Acked-by on v1 5/5
#13 lore raw

Re: [PATCH 5/5] ASoC: imx-sgtl5000: lower log level for potential probe deferral cases

In reply to Stefan Agner
Quoted 4 lines · Stefan Agner

Not finding the codec/SSI instance can be due to probe deferral. Do not print error messages in those cases.

Quoted 27 lines
---
 sound/soc/fsl/imx-sgtl5000.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
sound/soc/fsl/imx-sgtl5000.c +2 -2
index 45969e6dfad7..b6cb80480b60 100644
@@ -104,13 +104,13 @@ static int imx_sgtl5000_probe(struct platform_device *pdev)
 
 	ssi_pdev = of_find_device_by_node(ssi_np);
 	if (!ssi_pdev) {
-		dev_err(&pdev->dev, "failed to find SSI platform device\n");
+		dev_dbg(&pdev->dev, "failed to find SSI platform device\n");
 		ret = -EPROBE_DEFER;
 		goto fail;
 	}
 	codec_dev = of_find_i2c_device_by_node(codec_np);
 	if (!codec_dev) {
-		dev_err(&pdev->dev, "failed to find codec platform device\n");
+		dev_dbg(&pdev->dev, "failed to find codec platform device\n");
 		ret = -EPROBE_DEFER;
 		goto fail;
 	}
Signature · 1 line
2.20.1
reviewer Acked-by on v1 1/5
#15 lore raw
In reply to Stefan Agner
Quoted 4 lines · Stefan Agner

Probe deferral is to be expected during normal operation, so avoid printing an error when it is encountered.

Quoted 20 lines
---
 sound/soc/fsl/fsl_spdif.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/fsl/fsl_spdif.c +1 -1
index 740b90df44bb..a26686e7281c 100644
@@ -1320,7 +1320,7 @@ static int fsl_spdif_probe(struct platform_device *pdev)
 	}
 
 	ret = imx_pcm_dma_init(pdev, IMX_SPDIF_DMABUF_SIZE);
-	if (ret)
+	if (ret && ret != -EPROBE_DEFER)
 		dev_err(&pdev->dev, "imx_pcm_dma_init failed: %d\n", ret);
 
 	return ret;
Signature · 1 line
2.20.1