Commit 545502de authored by Takashi Iwai's avatar Takashi Iwai

ALSA: hda - Drop spec->channel_mode field from hda_gen_spec

It's never used in the generic parser.  It was there from the old
Realtek code, which has been dropped quite ago, too.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent f873e536
...@@ -3258,7 +3258,6 @@ int snd_hda_gen_build_pcms(struct hda_codec *codec) ...@@ -3258,7 +3258,6 @@ int snd_hda_gen_build_pcms(struct hda_codec *codec)
struct hda_pcm *info = spec->pcm_rec; struct hda_pcm *info = spec->pcm_rec;
const struct hda_pcm_stream *p; const struct hda_pcm_stream *p;
bool have_multi_adcs; bool have_multi_adcs;
int i;
codec->num_pcms = 1; codec->num_pcms = 1;
codec->pcm_info = info; codec->pcm_info = info;
...@@ -3296,15 +3295,6 @@ int snd_hda_gen_build_pcms(struct hda_codec *codec) ...@@ -3296,15 +3295,6 @@ int snd_hda_gen_build_pcms(struct hda_codec *codec)
info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nids[0]; info->stream[SNDRV_PCM_STREAM_CAPTURE].nid = spec->adc_nids[0];
} }
if (spec->channel_mode) {
info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = 0;
for (i = 0; i < spec->num_channel_mode; i++) {
if (spec->channel_mode[i].channels > info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max) {
info->stream[SNDRV_PCM_STREAM_PLAYBACK].channels_max = spec->channel_mode[i].channels;
}
}
}
skip_analog: skip_analog:
/* SPDIF for stream index #1 */ /* SPDIF for stream index #1 */
if (spec->multiout.dig_out_nid || spec->dig_in_nid) { if (spec->multiout.dig_out_nid || spec->dig_in_nid) {
......
...@@ -101,8 +101,6 @@ struct hda_gen_spec { ...@@ -101,8 +101,6 @@ struct hda_gen_spec {
unsigned int cur_mux[3]; unsigned int cur_mux[3];
/* channel model */ /* channel model */
const struct hda_channel_mode *channel_mode;
int num_channel_mode;
int const_channel_count; /* min. channel count (for speakers) */ int const_channel_count; /* min. channel count (for speakers) */
int ext_channel_count; /* current channel count for multi-io */ int ext_channel_count; /* current channel count for multi-io */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment