Skip to content

L
linux-davinci
Commit 9510e8dd authored by Lydia Wang's avatar Lydia Wang Committed by Takashi Iwai
Browse files
Options

ALSA: HDA VIA: Remove unused argument of via_new_analog_input 

Signed-off-by: default avatarLydia Wang <lydiawang@viatech.com.cn>
Signed-off-by: default avatarLogan Li <loganli@viatech.com.cn>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 17314379
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 12 deletions
sound/pci/hda/patch_via.c
View file @ 9510e8dd
...@@ -317,8 +317,8 @@ static void via_free_kctls(struct hda_codec *codec) ...@@ -317,8 +317,8 @@ static void via_free_kctls(struct hda_codec *codec)
} }
/* create input playback/capture controls for the given pin */ /* create input playback/capture controls for the given pin */
static int via_new_analog_input(struct via_spec *spec, hda_nid_t pin, static int via_new_analog_input(struct via_spec *spec, const char *ctlname,
const char *ctlname, int idx, int mix_nid) int idx, int mix_nid)
{ {
char name[32]; char name[32];
int err; int err;
...@@ -1480,8 +1480,7 @@ static int vt1708_auto_create_analog_input_ctls(struct via_spec *spec, ...@@ -1480,8 +1480,7 @@ static int vt1708_auto_create_analog_input_ctls(struct via_spec *spec,
idx = 1; idx = 1;
break; break;
} }
err = via_new_analog_input(spec, cfg->input_pins[i], labels[i], err = via_new_analog_input(spec, labels[i], idx, 0x17);
idx, 0x17);
if (err < 0) if (err < 0)
return err; return err;
imux->items[imux->num_items].label = labels[i]; imux->items[imux->num_items].label = labels[i];
...@@ -2014,8 +2013,7 @@ static int vt1709_auto_create_analog_input_ctls(struct via_spec *spec, ...@@ -2014,8 +2013,7 @@ static int vt1709_auto_create_analog_input_ctls(struct via_spec *spec,
idx = 1; idx = 1;
break; break;
} }
err = via_new_analog_input(spec, cfg->input_pins[i], labels[i], err = via_new_analog_input(spec, labels[i], idx, 0x18);
idx, 0x18);
if (err < 0) if (err < 0)
return err; return err;
imux->items[imux->num_items].label = labels[i]; imux->items[imux->num_items].label = labels[i];
...@@ -2576,8 +2574,7 @@ static int vt1708B_auto_create_analog_input_ctls(struct via_spec *spec, ...@@ -2576,8 +2574,7 @@ static int vt1708B_auto_create_analog_input_ctls(struct via_spec *spec,
idx = 1; idx = 1;
break; break;
} }
err = via_new_analog_input(spec, cfg->input_pins[i], labels[i], err = via_new_analog_input(spec, labels[i], idx, 0x16);
idx, 0x16);
if (err < 0) if (err < 0)
return err; return err;
imux->items[imux->num_items].label = labels[i]; imux->items[imux->num_items].label = labels[i];
...@@ -3048,8 +3045,7 @@ static int vt1708S_auto_create_analog_input_ctls(struct via_spec *spec, ...@@ -3048,8 +3045,7 @@ static int vt1708S_auto_create_analog_input_ctls(struct via_spec *spec,
idx = 1; idx = 1;
break; break;
} }
err = via_new_analog_input(spec, cfg->input_pins[i], labels[i], err = via_new_analog_input(spec, labels[i], idx, 0x16);
idx, 0x16);
if (err < 0) if (err < 0)
return err; return err;
imux->items[imux->num_items].label = labels[i]; imux->items[imux->num_items].label = labels[i];
...@@ -3402,8 +3398,7 @@ static int vt1702_auto_create_analog_input_ctls(struct via_spec *spec, ...@@ -3402,8 +3398,7 @@ static int vt1702_auto_create_analog_input_ctls(struct via_spec *spec,
idx = 3; idx = 3;
break; break;
} }
err = via_new_analog_input(spec, cfg->input_pins[i], err = via_new_analog_input(spec, labels[i], idx, 0x1A);
labels[i], idx, 0x1A);
if (err < 0) if (err < 0)
return err; return err;
imux->items[imux->num_items].label = labels[i]; imux->items[imux->num_items].label = labels[i];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment