Skip to contentSkip to conversation

ASoC: ti: davinci-mcasp: Fix fall-through warning for Clang

PATCH In review Gustavo A. R. Silva 4 participants 4 messages Jun 4, 2021

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

PATCH v2 1/1 ASoC: ti: davinci-mcasp: Fix fall-through warning for Clang

In preparation to enable -Wimplicit-fallthrough for Clang, fix a warning by explicitly adding a fallthrough; statement.

---
Changes in v2:
- Use fallthrough; instead of break;
- Update changelog text.

 sound/soc/ti/davinci-mcasp.c | 1 +
 1 file changed, 1 insertion(+)
sound/soc/ti/davinci-mcasp.c +1 -0
index b94220306d1a..017a5a5e56cd 100644
@@ -2317,6 +2317,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
 		break;
 	default:
 		dev_err(&pdev->dev, "No DMA controller found (%d)\n", ret);
+		fallthrough;
 	case -EPROBE_DEFER:
 		goto err;
 	}
Signature · 1 line
2.27.0
#1 lore raw
Quoted 10 lines · Gustavo A. R. Silva

In preparation to enable -Wimplicit-fallthrough for Clang, fix a warning by explicitly adding a fallthrough; statement.

---
Changes in v2:
 - Use fallthrough; instead of break;
 - Update changelog text.

[]

sound/soc/ti/davinci-mcasp.c

Quoted 1 line
sound/soc/ti/davinci-mcasp.c +0 -0

[]

Quoted 8 lines
sound/soc/ti/davinci-mcasp.c +0 -0
@@ -2317,6 +2317,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
  		break;

  default:
  dev_err(&pdev->dev, "No DMA controller found (%d)\n", ret);

sound/soc/ti/davinci-mcasp.c +1 -0
+		fallthrough;

  case -EPROBE_DEFER:
  goto err;
  }

While this is OK, perhaps the below would be clearer and a more common style as it doesn't intermix default: with logging output and a case label.

---
 sound/soc/ti/davinci-mcasp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/ti/davinci-mcasp.c +3 -1
index b94220306d1a8..1059a696ff90e 100644
@@ -2305,6 +2305,9 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
 		goto err;
 
 	ret = davinci_mcasp_get_dma_type(mcasp);
+	if (ret == -EPROBE_DEFER)
+		goto err;
+
 	switch (ret) {
 	case PCM_EDMA:
 		ret = edma_pcm_platform_register(&pdev->dev);
@@ -2317,7 +2320,6 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
 		break;
 	default:
 		dev_err(&pdev->dev, "No DMA controller found (%d)\n", ret);
-	case -EPROBE_DEFER:
 		goto err;
 	}
 
Acked-by Peter Ujfalusi
#2 lore raw
Quoted 14 lines · Joe Perches
Quoted 10 lines · Gustavo A. R. Silva

In preparation to enable -Wimplicit-fallthrough for Clang, fix a warning by explicitly adding a fallthrough; statement.

---
Changes in v2:
 - Use fallthrough; instead of break;
 - Update changelog text.

[]

sound/soc/ti/davinci-mcasp.c

Quoted 1 line
sound/soc/ti/davinci-mcasp.c +0 -0

[]

Quoted 11 lines
Quoted 8 lines
sound/soc/ti/davinci-mcasp.c +0 -0
@@ -2317,6 +2317,7 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
  		break;

  default:
  dev_err(&pdev->dev, "No DMA controller found (%d)\n", ret);

sound/soc/ti/davinci-mcasp.c +1 -0
+		fallthrough;

  case -EPROBE_DEFER:
  goto err;
  }

While this is OK, perhaps the below would be clearer and a more common style as it doesn't intermix default: with logging output and a case label.

True, this looks even better.

Quoted 27 lines
---
 sound/soc/ti/davinci-mcasp.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
sound/soc/ti/davinci-mcasp.c +3 -1
index b94220306d1a8..1059a696ff90e 100644
@@ -2305,6 +2305,9 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
 		goto err;
 
 	ret = davinci_mcasp_get_dma_type(mcasp);
+	if (ret == -EPROBE_DEFER)
+		goto err;
+
 	switch (ret) {
 	case PCM_EDMA:
 		ret = edma_pcm_platform_register(&pdev->dev);
@@ -2317,7 +2320,6 @@ static int davinci_mcasp_probe(struct platform_device *pdev)
 		break;
 	default:
 		dev_err(&pdev->dev, "No DMA controller found (%d)\n", ret);
-	case -EPROBE_DEFER:
 		goto err;
 	}
 
Signature · 1 line
Péter
maintainer
#3 lore raw
In reply to Gustavo A. R. Silva
Quoted 2 lines · Gustavo A. R. Silva

In preparation to enable -Wimplicit-fallthrough for Clang, fix a warning by explicitly adding a fallthrough; statement.

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next

Thanks!

[1/1] ASoC: ti: davinci-mcasp: Fix fall-through warning for Clang

      commit: 50d790012a48f0f2f1dc8e4c214054283e529ae9

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