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/hda_local.h | |
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/hda_local.h')
-rw-r--r-- | sound/pci/hda/hda_local.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/hda_local.h b/sound/pci/hda/hda_local.h index f36af375abb..1ed6ee5a1e7 100644 --- a/sound/pci/hda/hda_local.h +++ b/sound/pci/hda/hda_local.h | |||
@@ -267,11 +267,11 @@ enum { HDA_DIG_NONE, HDA_DIG_EXCLUSIVE, HDA_DIG_ANALOG_DUP }; /* dig_out_used */ | |||
267 | 267 | ||
268 | struct hda_multi_out { | 268 | struct hda_multi_out { |
269 | int num_dacs; /* # of DACs, must be more than 1 */ | 269 | int num_dacs; /* # of DACs, must be more than 1 */ |
270 | hda_nid_t *dac_nids; /* DAC list */ | 270 | const hda_nid_t *dac_nids; /* DAC list */ |
271 | hda_nid_t hp_nid; /* optional DAC for HP, 0 when not exists */ | 271 | hda_nid_t hp_nid; /* optional DAC for HP, 0 when not exists */ |
272 | hda_nid_t extra_out_nid[3]; /* optional DACs, 0 when not exists */ | 272 | hda_nid_t extra_out_nid[3]; /* optional DACs, 0 when not exists */ |
273 | hda_nid_t dig_out_nid; /* digital out audio widget */ | 273 | hda_nid_t dig_out_nid; /* digital out audio widget */ |
274 | hda_nid_t *slave_dig_outs; | 274 | const hda_nid_t *slave_dig_outs; |
275 | int max_channels; /* currently supported analog channels */ | 275 | int max_channels; /* currently supported analog channels */ |
276 | int dig_out_used; /* current usage of digital out (HDA_DIG_XXX) */ | 276 | int dig_out_used; /* current usage of digital out (HDA_DIG_XXX) */ |
277 | int no_share_stream; /* don't share a stream with multiple pins */ | 277 | int no_share_stream; /* don't share a stream with multiple pins */ |
@@ -443,7 +443,7 @@ struct auto_pin_cfg { | |||
443 | 443 | ||
444 | int snd_hda_parse_pin_def_config(struct hda_codec *codec, | 444 | int snd_hda_parse_pin_def_config(struct hda_codec *codec, |
445 | struct auto_pin_cfg *cfg, | 445 | struct auto_pin_cfg *cfg, |
446 | hda_nid_t *ignore_nids); | 446 | const hda_nid_t *ignore_nids); |
447 | 447 | ||
448 | /* amp values */ | 448 | /* amp values */ |
449 | #define AMP_IN_MUTE(idx) (0x7080 | ((idx)<<8)) | 449 | #define AMP_IN_MUTE(idx) (0x7080 | ((idx)<<8)) |