All of lore.kernel.org
 help / color / mirror / Atom feed
From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: alsa-devel@alsa-project.org
Cc: tiwai@suse.de, vkoul@kernel.org, broonie@kernel.org,
	Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Subject: [PATCH 11/18] ALSA: hda: (cosmetic) align function parameters
Date: Wed,  2 Sep 2020 16:21:26 -0500	[thread overview]
Message-ID: <20200902212133.30964-12-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <20200902212133.30964-1-pierre-louis.bossart@linux.intel.com>

Fix cppcheck warnings and use same names in headers and C code.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
 sound/pci/hda/hda_jack.h  | 2 +-
 sound/pci/hda/hda_local.h | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sound/pci/hda/hda_jack.h b/sound/pci/hda/hda_jack.h
index 727b6d3ba454..8ceaf0ef5df1 100644
--- a/sound/pci/hda/hda_jack.h
+++ b/sound/pci/hda/hda_jack.h
@@ -77,7 +77,7 @@ int snd_hda_jack_detect_enable(struct hda_codec *codec, hda_nid_t nid,
 
 struct hda_jack_callback *
 snd_hda_jack_detect_enable_callback_mst(struct hda_codec *codec, hda_nid_t nid,
-					int dev_id, hda_jack_callback_fn cb);
+					int dev_id, hda_jack_callback_fn func);
 
 /**
  * snd_hda_jack_detect_enable - enable the jack-detection
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h
index 8c28b1022f49..5beb8aa44ecd 100644
--- a/sound/pci/hda/hda_local.h
+++ b/sound/pci/hda/hda_local.h
@@ -100,7 +100,7 @@ int snd_hda_mixer_amp_volume_get(struct snd_kcontrol *kcontrol,
 int snd_hda_mixer_amp_volume_put(struct snd_kcontrol *kcontrol,
 				 struct snd_ctl_elem_value *ucontrol);
 int snd_hda_mixer_amp_tlv(struct snd_kcontrol *kcontrol, int op_flag,
-			  unsigned int size, unsigned int __user *tlv);
+			  unsigned int size, unsigned int __user *_tlv);
 int snd_hda_mixer_amp_switch_info(struct snd_kcontrol *kcontrol,
 				  struct snd_ctl_elem_info *uinfo);
 int snd_hda_mixer_amp_switch_get(struct snd_kcontrol *kcontrol,
@@ -119,7 +119,7 @@ int snd_hda_mixer_amp_switch_put_beep(struct snd_kcontrol *kcontrol,
 int snd_hda_codec_amp_update(struct hda_codec *codec, hda_nid_t nid,
 			     int ch, int dir, int idx, int mask, int val);
 int snd_hda_codec_amp_stereo(struct hda_codec *codec, hda_nid_t nid,
-			     int dir, int idx, int mask, int val);
+			     int direction, int idx, int mask, int val);
 int snd_hda_codec_amp_init(struct hda_codec *codec, hda_nid_t nid, int ch,
 			   int direction, int idx, int mask, int val);
 int snd_hda_codec_amp_init_stereo(struct hda_codec *codec, hda_nid_t nid,
@@ -198,7 +198,7 @@ int snd_hda_input_mux_put(struct hda_codec *codec,
 			  unsigned int *cur_val);
 int snd_hda_add_imux_item(struct hda_codec *codec,
 			  struct hda_input_mux *imux, const char *label,
-			  int index, int *type_index_ret);
+			  int index, int *type_idx);
 
 /*
  * Multi-channel / digital-out PCM helper
@@ -642,7 +642,7 @@ unsigned int snd_hda_codec_eapd_power_filter(struct hda_codec *codec,
  */
 int snd_hda_enum_helper_info(struct snd_kcontrol *kcontrol,
 			     struct snd_ctl_elem_info *uinfo,
-			     int num_entries, const char * const *texts);
+			     int num_items, const char * const *texts);
 #define snd_hda_enum_bool_helper_info(kcontrol, uinfo) \
 	snd_hda_enum_helper_info(kcontrol, uinfo, 0, NULL)
 
-- 
2.25.1


  parent reply	other threads:[~2020-09-02 21:30 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-02 21:21 [PATCH 00/18] ALSA: cleanups for sparse/cppcheck warnings Pierre-Louis Bossart
2020-09-02 21:21 ` [PATCH 01/18] ALSA: core: pcm: simplify locking for timers Pierre-Louis Bossart
2020-09-02 21:21 ` [PATCH 02/18] ALSA: core: memalloc: fix fallthrough position Pierre-Louis Bossart
2020-09-02 21:21 ` [PATCH 03/18] ALSA: core: pcm_memory: dereference pointer after NULL checks Pierre-Louis Bossart
2020-09-02 21:21 ` [PATCH 04/18] ALSA: core: timer: remove redundant assignment Pierre-Louis Bossart
2020-09-02 21:21 ` [PATCH 05/18] ALSA: core: timer: clarify operator precedence Pierre-Louis Bossart
2020-09-02 21:21 ` [PATCH 06/18] ALSA: compress_offload: dereference after checking for NULL pointer Pierre-Louis Bossart
2020-09-03  4:47   ` Vinod Koul
2020-09-02 21:21 ` [PATCH 07/18] ALSA: compress_offload: remove redundant initialization Pierre-Louis Bossart
2020-09-03  4:47   ` Vinod Koul
2020-09-02 21:21 ` [PATCH 08/18] ALSA: core: init: use DECLARE_COMPLETION_ONSTACK() macro Pierre-Louis Bossart
2020-09-02 21:21 ` [PATCH 09/18] ALSA: aoa: i2sbus: " Pierre-Louis Bossart
2020-09-02 21:21 ` [PATCH 10/18] ALSA: hda: auto_parser: remove shadowed variable declaration Pierre-Louis Bossart
2020-09-02 21:21 ` Pierre-Louis Bossart [this message]
2020-09-02 21:21 ` [PATCH 12/18] ALSA: usb: scarless_gen2: fix endianness issue Pierre-Louis Bossart
2020-09-02 21:21 ` [PATCH 13/18] ALSA: ac97: (cosmetic) align argument names Pierre-Louis Bossart
2020-09-02 21:21 ` [PATCH 14/18] ALSA: atmel: ac97: clarify operator precedence Pierre-Louis Bossart
2020-09-02 21:21 ` [PATCH 15/18] ALSA: rawmidi: (cosmetic) align function parameters Pierre-Louis Bossart
2020-09-02 21:21 ` [PATCH 16/18] ALSA: vx: vx_core: clarify operator precedence Pierre-Louis Bossart
2020-09-02 21:21 ` [PATCH 17/18] ALSA: vx: vx_pcm: remove redundant assignment Pierre-Louis Bossart
2020-09-02 21:21 ` [PATCH 18/18] " Pierre-Louis Bossart
2020-09-03  7:59 ` [PATCH 00/18] ALSA: cleanups for sparse/cppcheck warnings Takashi Iwai

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200902212133.30964-12-pierre-louis.bossart@linux.intel.com \
    --to=pierre-louis.bossart@linux.intel.com \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=tiwai@suse.de \
    --cc=vkoul@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.