diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-07-21 08:23:35 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-07-21 08:24:25 -0400 |
commit | a353fbb17961780c13e585e8658006ef0e543733 (patch) | |
tree | a52b0b6306d8676b7c732089f694afde5bdeb2f0 /sound/pci | |
parent | 020066d1ecc95d74da9be6beb436ac575af01271 (diff) |
ALSA: hda - Remove a superfluous argument of via_auto_init_output()
"force" argument is always true, so let's strip it off.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/hda/patch_via.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c index 761339a0694d..f38160b00e16 100644 --- a/sound/pci/hda/patch_via.c +++ b/sound/pci/hda/patch_via.c | |||
@@ -531,8 +531,7 @@ static void init_output_pin(struct hda_codec *codec, hda_nid_t pin, | |||
531 | } | 531 | } |
532 | 532 | ||
533 | static void via_auto_init_output(struct hda_codec *codec, | 533 | static void via_auto_init_output(struct hda_codec *codec, |
534 | struct nid_path *path, int pin_type, | 534 | struct nid_path *path, int pin_type) |
535 | bool force) | ||
536 | { | 535 | { |
537 | unsigned int caps; | 536 | unsigned int caps; |
538 | hda_nid_t pin; | 537 | hda_nid_t pin; |
@@ -549,7 +548,7 @@ static void via_auto_init_output(struct hda_codec *codec, | |||
549 | snd_hda_codec_write(codec, pin, 0, AC_VERB_SET_AMP_GAIN_MUTE, | 548 | snd_hda_codec_write(codec, pin, 0, AC_VERB_SET_AMP_GAIN_MUTE, |
550 | AMP_OUT_MUTE | val); | 549 | AMP_OUT_MUTE | val); |
551 | } | 550 | } |
552 | activate_output_path(codec, path, true, force); | 551 | activate_output_path(codec, path, true, true); /* force on */ |
553 | } | 552 | } |
554 | 553 | ||
555 | static void via_auto_init_multi_out(struct hda_codec *codec) | 554 | static void via_auto_init_multi_out(struct hda_codec *codec) |
@@ -562,7 +561,7 @@ static void via_auto_init_multi_out(struct hda_codec *codec) | |||
562 | path = &spec->out_path[i]; | 561 | path = &spec->out_path[i]; |
563 | if (!i && spec->aamix_mode && spec->out_mix_path.depth) | 562 | if (!i && spec->aamix_mode && spec->out_mix_path.depth) |
564 | path = &spec->out_mix_path; | 563 | path = &spec->out_mix_path; |
565 | via_auto_init_output(codec, path, PIN_OUT, true); | 564 | via_auto_init_output(codec, path, PIN_OUT); |
566 | } | 565 | } |
567 | } | 566 | } |
568 | 567 | ||
@@ -592,16 +591,16 @@ static void via_auto_init_hp_out(struct hda_codec *codec) | |||
592 | struct via_spec *spec = codec->spec; | 591 | struct via_spec *spec = codec->spec; |
593 | 592 | ||
594 | if (!spec->hp_path.depth) { | 593 | if (!spec->hp_path.depth) { |
595 | via_auto_init_output(codec, &spec->hp_mix_path, PIN_HP, true); | 594 | via_auto_init_output(codec, &spec->hp_mix_path, PIN_HP); |
596 | return; | 595 | return; |
597 | } | 596 | } |
598 | deactivate_hp_paths(codec); | 597 | deactivate_hp_paths(codec); |
599 | if (spec->hp_independent_mode) | 598 | if (spec->hp_independent_mode) |
600 | via_auto_init_output(codec, &spec->hp_indep_path, PIN_HP, true); | 599 | via_auto_init_output(codec, &spec->hp_indep_path, PIN_HP); |
601 | else if (spec->aamix_mode) | 600 | else if (spec->aamix_mode) |
602 | via_auto_init_output(codec, &spec->hp_mix_path, PIN_HP, true); | 601 | via_auto_init_output(codec, &spec->hp_mix_path, PIN_HP); |
603 | else | 602 | else |
604 | via_auto_init_output(codec, &spec->hp_path, PIN_HP, true); | 603 | via_auto_init_output(codec, &spec->hp_path, PIN_HP); |
605 | } | 604 | } |
606 | 605 | ||
607 | static void via_auto_init_speaker_out(struct hda_codec *codec) | 606 | static void via_auto_init_speaker_out(struct hda_codec *codec) |
@@ -611,19 +610,16 @@ static void via_auto_init_speaker_out(struct hda_codec *codec) | |||
611 | if (!spec->autocfg.speaker_outs) | 610 | if (!spec->autocfg.speaker_outs) |
612 | return; | 611 | return; |
613 | if (!spec->speaker_path.depth) { | 612 | if (!spec->speaker_path.depth) { |
614 | via_auto_init_output(codec, &spec->speaker_mix_path, PIN_OUT, | 613 | via_auto_init_output(codec, &spec->speaker_mix_path, PIN_OUT); |
615 | true); | ||
616 | return; | 614 | return; |
617 | } | 615 | } |
618 | if (!spec->aamix_mode) { | 616 | if (!spec->aamix_mode) { |
619 | activate_output_path(codec, &spec->speaker_mix_path, | 617 | activate_output_path(codec, &spec->speaker_mix_path, |
620 | false, false); | 618 | false, false); |
621 | via_auto_init_output(codec, &spec->speaker_path, PIN_OUT, | 619 | via_auto_init_output(codec, &spec->speaker_path, PIN_OUT); |
622 | true); | ||
623 | } else { | 620 | } else { |
624 | activate_output_path(codec, &spec->speaker_path, false, false); | 621 | activate_output_path(codec, &spec->speaker_path, false, false); |
625 | via_auto_init_output(codec, &spec->speaker_mix_path, PIN_OUT, | 622 | via_auto_init_output(codec, &spec->speaker_mix_path, PIN_OUT); |
626 | true); | ||
627 | } | 623 | } |
628 | } | 624 | } |
629 | 625 | ||