diff options
| author | Lydia Wang <lydiawang@viatech.com.cn> | 2009-10-10 07:07:39 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2009-10-11 11:55:18 -0400 |
| commit | 9510e8dd9cb4469d146953270364af6dd86a39be (patch) | |
| tree | f3e515dc72a3c860c4f8e335c4199592fc4df3cb /sound/pci/hda/patch_via.c | |
| parent | 173143791068ac9f155c378a591d0b3d6c4a45ca (diff) | |
ALSA: HDA VIA: Remove unused argument of via_new_analog_input
Signed-off-by: Lydia Wang <lydiawang@viatech.com.cn>
Signed-off-by: Logan Li <loganli@viatech.com.cn>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_via.c')
| -rw-r--r-- | sound/pci/hda/patch_via.c | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c index 7ace0fca933d..0da57db3a691 100644 --- a/sound/pci/hda/patch_via.c +++ b/sound/pci/hda/patch_via.c | |||
| @@ -317,8 +317,8 @@ static void via_free_kctls(struct hda_codec *codec) | |||
| 317 | } | 317 | } |
| 318 | 318 | ||
| 319 | /* create input playback/capture controls for the given pin */ | 319 | /* create input playback/capture controls for the given pin */ |
| 320 | static int via_new_analog_input(struct via_spec *spec, hda_nid_t pin, | 320 | static int via_new_analog_input(struct via_spec *spec, const char *ctlname, |
| 321 | const char *ctlname, int idx, int mix_nid) | 321 | int idx, int mix_nid) |
| 322 | { | 322 | { |
| 323 | char name[32]; | 323 | char name[32]; |
| 324 | int err; | 324 | int err; |
| @@ -1480,8 +1480,7 @@ static int vt1708_auto_create_analog_input_ctls(struct via_spec *spec, | |||
| 1480 | idx = 1; | 1480 | idx = 1; |
| 1481 | break; | 1481 | break; |
| 1482 | } | 1482 | } |
| 1483 | err = via_new_analog_input(spec, cfg->input_pins[i], labels[i], | 1483 | err = via_new_analog_input(spec, labels[i], idx, 0x17); |
| 1484 | idx, 0x17); | ||
| 1485 | if (err < 0) | 1484 | if (err < 0) |
| 1486 | return err; | 1485 | return err; |
| 1487 | imux->items[imux->num_items].label = labels[i]; | 1486 | 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 | idx = 1; | 2013 | idx = 1; |
| 2015 | break; | 2014 | break; |
| 2016 | } | 2015 | } |
| 2017 | err = via_new_analog_input(spec, cfg->input_pins[i], labels[i], | 2016 | err = via_new_analog_input(spec, labels[i], idx, 0x18); |
| 2018 | idx, 0x18); | ||
| 2019 | if (err < 0) | 2017 | if (err < 0) |
| 2020 | return err; | 2018 | return err; |
| 2021 | imux->items[imux->num_items].label = labels[i]; | 2019 | 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 | idx = 1; | 2574 | idx = 1; |
| 2577 | break; | 2575 | break; |
| 2578 | } | 2576 | } |
| 2579 | err = via_new_analog_input(spec, cfg->input_pins[i], labels[i], | 2577 | err = via_new_analog_input(spec, labels[i], idx, 0x16); |
| 2580 | idx, 0x16); | ||
| 2581 | if (err < 0) | 2578 | if (err < 0) |
| 2582 | return err; | 2579 | return err; |
| 2583 | imux->items[imux->num_items].label = labels[i]; | 2580 | 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 | idx = 1; | 3045 | idx = 1; |
| 3049 | break; | 3046 | break; |
| 3050 | } | 3047 | } |
| 3051 | err = via_new_analog_input(spec, cfg->input_pins[i], labels[i], | 3048 | err = via_new_analog_input(spec, labels[i], idx, 0x16); |
| 3052 | idx, 0x16); | ||
| 3053 | if (err < 0) | 3049 | if (err < 0) |
| 3054 | return err; | 3050 | return err; |
| 3055 | imux->items[imux->num_items].label = labels[i]; | 3051 | 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 | idx = 3; | 3398 | idx = 3; |
| 3403 | break; | 3399 | break; |
| 3404 | } | 3400 | } |
| 3405 | err = via_new_analog_input(spec, cfg->input_pins[i], | 3401 | err = via_new_analog_input(spec, labels[i], idx, 0x1A); |
| 3406 | labels[i], idx, 0x1A); | ||
| 3407 | if (err < 0) | 3402 | if (err < 0) |
| 3408 | return err; | 3403 | return err; |
| 3409 | imux->items[imux->num_items].label = labels[i]; | 3404 | imux->items[imux->num_items].label = labels[i]; |