diff options
| author | Takashi Iwai <tiwai@suse.de> | 2013-01-07 17:25:08 +0100 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2013-01-12 08:44:11 +0100 |
| commit | 3ca529d339f1904b68c6251172522302fca77b28 (patch) | |
| tree | a56c0a41db62e26cdec6bce9d284edcb0af5304d /sound/pci/hda/hda_generic.h | |
| parent | c697b716859c6c8c4e9f102304638c83ff2e61aa (diff) | |
| download | talos-obmc-linux-3ca529d339f1904b68c6251172522302fca77b28.tar.gz talos-obmc-linux-3ca529d339f1904b68c6251172522302fca77b28.zip | |
ALSA: hda - Re-define snd_hda_parse_nid_path()
This commit modifies the definition of snd_hda_parse_nid_path()
slightly, now with_aa_mix argument is changed to anchor_nid, so that
it can handle any NID generically as an anchor point to include or
exclude.
The with_aa_mix field in struct nid_path is removed again by this
change.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/hda_generic.h')
| -rw-r--r-- | sound/pci/hda/hda_generic.h | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h index 1ad9127e9f95..343195c827e4 100644 --- a/sound/pci/hda/hda_generic.h +++ b/sound/pci/hda/hda_generic.h @@ -53,7 +53,6 @@ struct nid_path { unsigned char multi[MAX_NID_PATH_DEPTH]; unsigned int ctls[NID_PATH_NUM_CTLS]; /* NID_PATH_XXX_CTL */ bool active; - bool with_aa_mix; }; /* mic/line-in auto switching entry */ @@ -237,19 +236,12 @@ struct nid_path *snd_hda_get_nid_path(struct hda_codec *codec, hda_nid_t from_nid, hda_nid_t to_nid); int snd_hda_get_path_idx(struct hda_codec *codec, struct nid_path *path); struct nid_path *snd_hda_get_path_from_idx(struct hda_codec *codec, int idx); - -enum { - HDA_PARSE_NO_AAMIX, - HDA_PARSE_ONLY_AAMIX, - HDA_PARSE_ALL, -}; - bool snd_hda_parse_nid_path(struct hda_codec *codec, hda_nid_t from_nid, - hda_nid_t to_nid, int with_aa_mix, + hda_nid_t to_nid, int anchor_nid, struct nid_path *path); struct nid_path * snd_hda_add_new_path(struct hda_codec *codec, hda_nid_t from_nid, - hda_nid_t to_nid, int with_aa_mix); + hda_nid_t to_nid, int anchor_nid); void snd_hda_activate_path(struct hda_codec *codec, struct nid_path *path, bool enable, bool add_aamix); |
