2020-04-22 07:20:29

by Jason Yan

Subject: [PATCH] ASoC: soc-core: return true,false in snd_soc_volsw_is_stereo()

Fix the following coccicheck warning:

include/sound/soc.h:1271:9-10: WARNING: return of 0/1 in function
'snd_soc_volsw_is_stereo' with return type bool

Signed-off-by: Jason Yan <[email protected]>
---
include/sound/soc.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/sound/soc.h b/include/sound/soc.h
index 946f88a6c63d..d1e9a526363e 100644
--- a/include/sound/soc.h
+++ b/include/sound/soc.h
@@ -1268,13 +1268,13 @@ static inline void *snd_soc_card_get_drvdata(struct snd_soc_card *card)
static inline bool snd_soc_volsw_is_stereo(struct soc_mixer_control *mc)
{
if (mc->reg == mc->rreg && mc->shift == mc->rshift)
- return 0;
+ return false;
/*
* mc->reg == mc->rreg && mc->shift != mc->rshift, or
* mc->reg != mc->rreg means that the control is
* stereo (bits in one register or in two registers)
*/
- return 1;
+ return true;
}

static inline unsigned int snd_soc_enum_val_to_item(struct soc_enum *e,
--
2.21.1

2020-04-22 12:27:16

by Mark Brown

Subject: Re: [PATCH] ASoC: soc-core: return true, false in snd_soc_volsw_is_stereo()

On Wed, 22 Apr 2020 15:18:05 +0800, Jason Yan wrote:
> Fix the following coccicheck warning:
>
> include/sound/soc.h:1271:9-10: WARNING: return of 0/1 in function
> 'snd_soc_volsw_is_stereo' with return type bool
>
> Signed-off-by: Jason Yan <[email protected]>
>
> [...]

Applied to

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

Thanks!

[1/1] ASoC: soc-core: return true, false in snd_soc_volsw_is_stereo()
commit: 4aa86e05be84b0692846799fce16c233a170c559

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