2023-05-12 06:45:01

by Jiapeng Chong

[permalink] [raw]
Subject: [PATCH] ASoC: SOF: Simplify the calculation of variables

./sound/soc/sof/pcm.c:372:27-29: WARNING !A || A && B is equivalent to !A || B.

Reported-by: Abaci Robot <[email protected]>
Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=4938
Signed-off-by: Jiapeng Chong <[email protected]>
---
sound/soc/sof/pcm.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/sof/pcm.c b/sound/soc/sof/pcm.c
index 567db32173a8..d14e7fd2c2ee 100644
--- a/sound/soc/sof/pcm.c
+++ b/sound/soc/sof/pcm.c
@@ -369,7 +369,7 @@ static int sof_pcm_trigger(struct snd_soc_component *component,
case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
case SNDRV_PCM_TRIGGER_STOP:
/* invoke platform trigger to stop DMA even if pcm_ops isn't set or if it failed */
- if (!pcm_ops || (pcm_ops && !pcm_ops->platform_stop_during_hw_free))
+ if (!pcm_ops || !pcm_ops->platform_stop_during_hw_free)
snd_sof_pcm_platform_trigger(sdev, substream, cmd);
break;
default:
--
2.20.1.7.g153144c



2023-05-12 10:25:02

by Péter Ujfalusi

[permalink] [raw]
Subject: Re: [PATCH] ASoC: SOF: Simplify the calculation of variables



On 12/05/2023 09:42, Jiapeng Chong wrote:
> ./sound/soc/sof/pcm.c:372:27-29: WARNING !A || A && B is equivalent to !A || B.

This is correct.

Reviewed-by: Peter Ujfalusi <[email protected]>

> Reported-by: Abaci Robot <[email protected]>
> Link: https://bugzilla.openanolis.cn/show_bug.cgi?id=4938
> Signed-off-by: Jiapeng Chong <[email protected]>
> ---
> sound/soc/sof/pcm.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/sound/soc/sof/pcm.c b/sound/soc/sof/pcm.c
> index 567db32173a8..d14e7fd2c2ee 100644
> --- a/sound/soc/sof/pcm.c
> +++ b/sound/soc/sof/pcm.c
> @@ -369,7 +369,7 @@ static int sof_pcm_trigger(struct snd_soc_component *component,
> case SNDRV_PCM_TRIGGER_PAUSE_PUSH:
> case SNDRV_PCM_TRIGGER_STOP:
> /* invoke platform trigger to stop DMA even if pcm_ops isn't set or if it failed */
> - if (!pcm_ops || (pcm_ops && !pcm_ops->platform_stop_during_hw_free))
> + if (!pcm_ops || !pcm_ops->platform_stop_during_hw_free)
> snd_sof_pcm_platform_trigger(sdev, substream, cmd);
> break;
> default:

--
Péter

2023-05-15 15:32:52

by Mark Brown

[permalink] [raw]
Subject: Re: [PATCH] ASoC: SOF: Simplify the calculation of variables

On Fri, 12 May 2023 14:42:25 +0800, Jiapeng Chong wrote:
> ./sound/soc/sof/pcm.c:372:27-29: WARNING !A || A && B is equivalent to !A || B.
>
>

Applied to

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

Thanks!

[1/1] ASoC: SOF: Simplify the calculation of variables
commit: d904942aeaa6a6fe493f2825048613ee46c0e991

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