diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-05-02 05:29:30 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-05-02 06:07:48 -0400 |
commit | dda144103c4a47a504fcaa8cddd08a4440c87060 (patch) | |
tree | 3d6435dbb61e37349153b63326123606d6cd5dba /sound/pci/hda/patch_realtek.c | |
parent | a9111321f2fb6a23fbed82b8b4cbd77f5580ba75 (diff) |
ALSA: hda - Constify some API function arguments
Also fixed the assignment of multiout.dac_nids to satisfy const.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_realtek.c')
-rw-r--r-- | sound/pci/hda/patch_realtek.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 5b79080be76a..ac0400929dcb 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c | |||
@@ -5294,7 +5294,7 @@ static int alc880_auto_fill_dac_nids(struct alc_spec *spec, | |||
5294 | nid = cfg->line_out_pins[i]; | 5294 | nid = cfg->line_out_pins[i]; |
5295 | if (alc880_is_fixed_pin(nid)) { | 5295 | if (alc880_is_fixed_pin(nid)) { |
5296 | int idx = alc880_fixed_pin_idx(nid); | 5296 | int idx = alc880_fixed_pin_idx(nid); |
5297 | spec->multiout.dac_nids[i] = alc880_idx_to_dac(idx); | 5297 | spec->private_dac_nids[i] = alc880_idx_to_dac(idx); |
5298 | assigned[idx] = 1; | 5298 | assigned[idx] = 1; |
5299 | } | 5299 | } |
5300 | } | 5300 | } |
@@ -5306,7 +5306,7 @@ static int alc880_auto_fill_dac_nids(struct alc_spec *spec, | |||
5306 | /* search for an empty channel */ | 5306 | /* search for an empty channel */ |
5307 | for (j = 0; j < cfg->line_outs; j++) { | 5307 | for (j = 0; j < cfg->line_outs; j++) { |
5308 | if (!assigned[j]) { | 5308 | if (!assigned[j]) { |
5309 | spec->multiout.dac_nids[i] = | 5309 | spec->private_dac_nids[i] = |
5310 | alc880_idx_to_dac(j); | 5310 | alc880_idx_to_dac(j); |
5311 | assigned[j] = 1; | 5311 | assigned[j] = 1; |
5312 | break; | 5312 | break; |
@@ -7131,7 +7131,7 @@ static int alc260_auto_create_multi_out_ctls(struct alc_spec *spec, | |||
7131 | 7131 | ||
7132 | spec->multiout.num_dacs = 1; | 7132 | spec->multiout.num_dacs = 1; |
7133 | spec->multiout.dac_nids = spec->private_dac_nids; | 7133 | spec->multiout.dac_nids = spec->private_dac_nids; |
7134 | spec->multiout.dac_nids[0] = 0x02; | 7134 | spec->private_dac_nids[0] = 0x02; |
7135 | 7135 | ||
7136 | nid = cfg->line_out_pins[0]; | 7136 | nid = cfg->line_out_pins[0]; |
7137 | if (nid) { | 7137 | if (nid) { |
@@ -12214,7 +12214,7 @@ static int alc262_auto_create_multi_out_ctls(struct alc_spec *spec, | |||
12214 | 12214 | ||
12215 | spec->multiout.num_dacs = 1; /* only use one dac */ | 12215 | spec->multiout.num_dacs = 1; /* only use one dac */ |
12216 | spec->multiout.dac_nids = spec->private_dac_nids; | 12216 | spec->multiout.dac_nids = spec->private_dac_nids; |
12217 | spec->multiout.dac_nids[0] = 2; | 12217 | spec->private_dac_nids[0] = 2; |
12218 | 12218 | ||
12219 | pfx = alc_get_line_out_pfx(spec, true); | 12219 | pfx = alc_get_line_out_pfx(spec, true); |
12220 | if (!pfx) | 12220 | if (!pfx) |
@@ -13553,7 +13553,7 @@ static int alc268_new_analog_output(struct alc_spec *spec, hda_nid_t nid, | |||
13553 | HDA_OUTPUT)); | 13553 | HDA_OUTPUT)); |
13554 | if (err < 0) | 13554 | if (err < 0) |
13555 | return err; | 13555 | return err; |
13556 | spec->multiout.dac_nids[spec->multiout.num_dacs++] = dac; | 13556 | spec->private_dac_nids[spec->multiout.num_dacs++] = dac; |
13557 | } | 13557 | } |
13558 | 13558 | ||
13559 | if (nid != 0x16) | 13559 | if (nid != 0x16) |
@@ -15951,7 +15951,7 @@ static int alc861_auto_fill_dac_nids(struct hda_codec *codec, | |||
15951 | dac = alc861_look_for_dac(codec, nid); | 15951 | dac = alc861_look_for_dac(codec, nid); |
15952 | if (!dac) | 15952 | if (!dac) |
15953 | continue; | 15953 | continue; |
15954 | spec->multiout.dac_nids[spec->multiout.num_dacs++] = dac; | 15954 | spec->private_dac_nids[spec->multiout.num_dacs++] = dac; |
15955 | } | 15955 | } |
15956 | return 0; | 15956 | return 0; |
15957 | } | 15957 | } |
@@ -18932,7 +18932,7 @@ static int alc662_auto_fill_dac_nids(struct hda_codec *codec, | |||
18932 | dac = alc_auto_look_for_dac(codec, cfg->line_out_pins[i]); | 18932 | dac = alc_auto_look_for_dac(codec, cfg->line_out_pins[i]); |
18933 | if (!dac) | 18933 | if (!dac) |
18934 | continue; | 18934 | continue; |
18935 | spec->multiout.dac_nids[spec->multiout.num_dacs++] = dac; | 18935 | spec->private_dac_nids[spec->multiout.num_dacs++] = dac; |
18936 | } | 18936 | } |
18937 | return 0; | 18937 | return 0; |
18938 | } | 18938 | } |
@@ -19166,7 +19166,7 @@ static int alc_auto_fill_multi_ios(struct hda_codec *codec, | |||
19166 | spec->multi_io[num_pins].pin = nid; | 19166 | spec->multi_io[num_pins].pin = nid; |
19167 | spec->multi_io[num_pins].dac = dac; | 19167 | spec->multi_io[num_pins].dac = dac; |
19168 | num_pins++; | 19168 | num_pins++; |
19169 | spec->multiout.dac_nids[spec->multiout.num_dacs++] = dac; | 19169 | spec->private_dac_nids[spec->multiout.num_dacs++] = dac; |
19170 | } | 19170 | } |
19171 | } | 19171 | } |
19172 | spec->multiout.num_dacs = 1; | 19172 | spec->multiout.num_dacs = 1; |
@@ -19786,7 +19786,7 @@ static int alc680_new_analog_output(struct alc_spec *spec, hda_nid_t nid, | |||
19786 | 19786 | ||
19787 | if (err < 0) | 19787 | if (err < 0) |
19788 | return err; | 19788 | return err; |
19789 | spec->multiout.dac_nids[spec->multiout.num_dacs++] = dac; | 19789 | spec->private_dac_nids[spec->multiout.num_dacs++] = dac; |
19790 | } | 19790 | } |
19791 | 19791 | ||
19792 | return 0; | 19792 | return 0; |