From 545502de54c5ec31222915e5b977a86d603cec86 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Thu, 20 Dec 2012 17:05:20 +0100 Subject: [PATCH] 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: Takashi Iwai --- sound/pci/hda/hda_generic.c | 10 ---------- sound/pci/hda/hda_generic.h | 2 -- 2 files changed, 12 deletions(-) diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index d4cb9df6..43acf3d 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -3258,7 +3258,6 @@ int snd_hda_gen_build_pcms(struct hda_codec *codec) struct hda_pcm *info = spec->pcm_rec; const struct hda_pcm_stream *p; bool have_multi_adcs; - int i; codec->num_pcms = 1; codec->pcm_info = info; @@ -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]; } - 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: /* SPDIF for stream index #1 */ if (spec->multiout.dig_out_nid || spec->dig_in_nid) { diff --git a/sound/pci/hda/hda_generic.h b/sound/pci/hda/hda_generic.h index a406cd4..6365140 100644 --- a/sound/pci/hda/hda_generic.h +++ b/sound/pci/hda/hda_generic.h @@ -101,8 +101,6 @@ struct hda_gen_spec { unsigned int cur_mux[3]; /* channel model */ - const struct hda_channel_mode *channel_mode; - int num_channel_mode; int const_channel_count; /* min. channel count (for speakers) */ int ext_channel_count; /* current channel count for multi-io */ -- 2.7.4