diff options
| author | Takashi Iwai | 2011-06-28 12:45:47 +0200 |
|---|---|---|
| committer | Takashi Iwai | 2011-06-29 08:01:46 +0200 |
| commit | 8d087c7600499463b7b8e3d4da4da40669cb8bfa (patch) | |
| tree | 817ba350193d4c1cd77546dbd0bbe0d68ee14ecf /sound/pci/hda/patch_cirrus.c | |
| parent | ALSA: hda - Fix unsol event initializations for VIA codecs (diff) | |
| download | kernel-qcow2-linux-8d087c7600499463b7b8e3d4da4da40669cb8bfa.tar.gz kernel-qcow2-linux-8d087c7600499463b7b8e3d4da4da40669cb8bfa.tar.xz kernel-qcow2-linux-8d087c7600499463b7b8e3d4da4da40669cb8bfa.zip | |
ALSA: hda - Create snd_hda_get_conn_index() helper function
Create snd_hda_get_conn_index() helper function for obtaining the
connection index of the widget. Replaced the similar codes used in
several codec-drivers with this common helper.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_cirrus.c')
| -rw-r--r-- | sound/pci/hda/patch_cirrus.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/sound/pci/hda/patch_cirrus.c b/sound/pci/hda/patch_cirrus.c index c7b5ca28fa77..7f93739b1e33 100644 --- a/sound/pci/hda/patch_cirrus.c +++ b/sound/pci/hda/patch_cirrus.c @@ -346,21 +346,15 @@ static hda_nid_t get_adc(struct hda_codec *codec, hda_nid_t pin, nid = codec->start_nid; for (i = 0; i < codec->num_nodes; i++, nid++) { - hda_nid_t pins[2]; unsigned int type; - int j, nums; + int idx; type = get_wcaps_type(get_wcaps(codec, nid)); if (type != AC_WID_AUD_IN) continue; - nums = snd_hda_get_connections(codec, nid, pins, - ARRAY_SIZE(pins)); - if (nums <= 0) - continue; - for (j = 0; j < nums; j++) { - if (pins[j] == pin) { - *idxp = j; - return nid; - } + idx = snd_hda_get_conn_index(codec, nid, pin, 0); + if (idx >= 0) { + *idxp = idx; + return nid; } } return 0; |