leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: hda - Small code refactoring about path re-initialization

Browse Source 
Introduce a helper function to do the same thing.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2013-01-23 17:07:23 +01:00
parent e4a395e781
commit 3e367f155f
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
sound/pci/hda/hda_generic.c
View File

@ -735,6 +735,14 @@ static void set_pin_eapd(struct hda_codec *codec, hda_nid_t pin, bool enable)
enable ? 0x02 : 0x00); enable ? 0x02 : 0x00);
} }
/* re-initialize the path specified by the given path index */
static void resume_path_from_idx(struct hda_codec *codec, int path_idx)
{
struct nid_path *path = snd_hda_get_path_from_idx(codec, path_idx);
if (path)
snd_hda_activate_path(codec, path, path->active, false);
}
/* /*
* Helper functions for creating mixer ctl elements * Helper functions for creating mixer ctl elements
@ -4684,16 +4692,8 @@ static void init_analog_input(struct hda_codec *codec)
/* init loopback inputs */ /* init loopback inputs */
if (spec->mixer_nid) { if (spec->mixer_nid) {
struct nid_path *path; resume_path_from_idx(codec, spec->loopback_paths[i]);
path = snd_hda_get_path_from_idx(codec, spec->loopback_paths[i]); resume_path_from_idx(codec, spec->loopback_merge_path);
if (path)
snd_hda_activate_path(codec, path,
path->active, false);
path = snd_hda_get_path_from_idx(codec,
spec->loopback_merge_path);
if (path)
snd_hda_activate_path(codec, path, path->active,
false);
} }
} }
} }
@ -4741,11 +4741,8 @@ static void init_digital(struct hda_codec *codec)
set_output_and_unmute(codec, spec->digout_paths[i]); set_output_and_unmute(codec, spec->digout_paths[i]);
pin = spec->autocfg.dig_in_pin; pin = spec->autocfg.dig_in_pin;
if (pin) { if (pin) {
struct nid_path *path;
restore_pin_ctl(codec, pin); restore_pin_ctl(codec, pin);
path = snd_hda_get_path_from_idx(codec, spec->digin_path); resume_path_from_idx(codec, spec->digin_path);
if (path)
snd_hda_activate_path(codec, path, path->active, false);
} }
} }