diff mbox series

ASoC: SOF: control: fix cppcheck warning in snd_sof_volume_info()

Message ID 20201204170313.2704499-1-kai.vehmanen@linux.intel.com
State New
Headers show
Series ASoC: SOF: control: fix cppcheck warning in snd_sof_volume_info() | expand

Commit Message

Kai Vehmanen Dec. 4, 2020, 5:03 p.m. UTC 
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>

Fix cppcheck warning:

sound/soc/sof/control.c:117:82: style:inconclusive: Function
'snd_sof_volume_info' argument 2 names different: declaration
'ucontrol' definition 'uinfo'. [funcArgNamesDifferent]

Fixes: fca18e62984a ("ASoC: SOF: control: override volume info callback")
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
---
 sound/soc/sof/sof-audio.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Mark Brown Dec. 4, 2020, 11:30 p.m. UTC | #1 
On Fri, 4 Dec 2020 19:03:13 +0200, Kai Vehmanen wrote:
> Fix cppcheck warning:
> 
> sound/soc/sof/control.c:117:82: style:inconclusive: Function
> 'snd_sof_volume_info' argument 2 names different: declaration
> 'ucontrol' definition 'uinfo'. [funcArgNamesDifferent]

Applied to

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

Thanks!

[1/1] ASoC: SOF: control: fix cppcheck warning in snd_sof_volume_info()
      commit: 518a760cc369eafeef0d6c76d8c30a8acab2c921

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
diff mbox series

Patch

diff --git a/sound/soc/sof/sof-audio.h b/sound/soc/sof/sof-audio.h
index d00a918b6f39..dc930fc2f4b5 100644
--- a/sound/soc/sof/sof-audio.h
+++ b/sound/soc/sof/sof-audio.h
@@ -125,7 +125,7 @@  int snd_sof_volume_get(struct snd_kcontrol *kcontrol,
 int snd_sof_volume_put(struct snd_kcontrol *kcontrol,
 		       struct snd_ctl_elem_value *ucontrol);
 int snd_sof_volume_info(struct snd_kcontrol *kcontrol,
-			struct snd_ctl_elem_info *ucontrol);
+			struct snd_ctl_elem_info *uinfo);
 int snd_sof_switch_get(struct snd_kcontrol *kcontrol,
 		       struct snd_ctl_elem_value *ucontrol);
 int snd_sof_switch_put(struct snd_kcontrol *kcontrol,