openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

ALSA: hda/ca0132 - Clean up ca0132_init function. 

This patch cleans up ca0132_init by removing unnecessary commands and
ordering things better.

Signed-off-by: Connor McAdams <conmanx360@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Connor McAdams 2018-08-08 13:34:13 -04:00 committed by Takashi Iwai
parent a62e473947
commit d97420d2b0
1 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sound/pci/hda/patch_ca0132.c
View File

@ -7249,14 +7249,12 @@ static int ca0132_init(struct hda_codec *codec)
ca0132_refresh_widget_caps(codec);
if (spec->quirk == QUIRK_SBZ)
ca0132_mmio_gpio_set(codec, 7, true);
switch (spec->quirk) {
case QUIRK_R3DI:
r3di_setup_defaults(codec);
break;
case QUIRK_SBZ:
sbz_setup_defaults(codec);
break;
default:
ca0132_setup_defaults(codec);
@ -7287,20 +7285,12 @@ static int ca0132_init(struct hda_codec *codec)
ca0132_gpio_setup(codec);
snd_hda_sequence_write(codec, spec->spec_init_verbs);
switch (spec->quirk) {
case QUIRK_SBZ:
sbz_setup_defaults(codec);
if (spec->use_alt_functions) {
ca0132_alt_select_out(codec);
ca0132_alt_select_in(codec);
break;
case QUIRK_R3DI:
ca0132_alt_select_out(codec);
ca0132_alt_select_in(codec);
break;
default:
} else {
ca0132_select_out(codec);
ca0132_select_mic(codec);
break;
}
snd_hda_jack_report_sync(codec);