In preparation to enable -Wimplicit-fallthrough for Clang, fix a warning
by explicitly adding a fallthrough; statement.
Link: https://github.com/KSPP/linux/issues/115
Signed-off-by: Gustavo A. R. Silva <[email protected]>
---
Changes in v2:
- Use fallthrough; instead of break;
- Update changelog text.
Link: https://lore.kernel.org/linux-hardening/[email protected]/
sound/soc/ti/davinci-mcasp.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c
index b94220306d1a..017a5a5e56cd 100644
--- a/sound/soc/ti/davinci-mcasp.c
+++ b/sound/soc/ti/davinci-mcasp.c
@@ -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;
}
--
2.27.0
On Fri, 2021-06-04 at 02:27 -0500, Gustavo A. R. Silva wrote:
> In preparation to enable -Wimplicit-fallthrough for Clang, fix a warning
> by explicitly adding a fallthrough; statement.
>
> Link: https://github.com/KSPP/linux/issues/115
> Signed-off-by: Gustavo A. R. Silva <[email protected]>
> ---
> Changes in v2:
> ?- Use fallthrough; instead of break;
> ?- Update changelog text.
> ?Link: https://lore.kernel.org/linux-hardening/[email protected]/
[]
> diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c
[]
> @@ -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;
> ? }
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(-)
diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c
index b94220306d1a8..1059a696ff90e 100644
--- a/sound/soc/ti/davinci-mcasp.c
+++ b/sound/soc/ti/davinci-mcasp.c
@@ -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;
}
On 04/06/2021 10:53, Joe Perches wrote:
> On Fri, 2021-06-04 at 02:27 -0500, Gustavo A. R. Silva wrote:
>> In preparation to enable -Wimplicit-fallthrough for Clang, fix a warning
>> by explicitly adding a fallthrough; statement.
>>
>> Link: https://github.com/KSPP/linux/issues/115
>> Signed-off-by: Gustavo A. R. Silva <[email protected]>
>> ---
>> Changes in v2:
>> - Use fallthrough; instead of break;
>> - Update changelog text.
>> Link: https://lore.kernel.org/linux-hardening/[email protected]/
> []
>> diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c
> []
>> @@ -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;
>> }
>
> 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.
Acked-by: Peter Ujfalusi <[email protected]>
> ---
> sound/soc/ti/davinci-mcasp.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/sound/soc/ti/davinci-mcasp.c b/sound/soc/ti/davinci-mcasp.c
> index b94220306d1a8..1059a696ff90e 100644
> --- a/sound/soc/ti/davinci-mcasp.c
> +++ b/sound/soc/ti/davinci-mcasp.c
> @@ -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;
> }
>
>
--
Péter
On Fri, 4 Jun 2021 02:27:14 -0500, Gustavo A. R. Silva wrote:
> 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