ALSA: hda - Drop spec->channel_mode field from hda_gen_spec
authorTakashi Iwai <tiwai@suse.de>
Thu, 20 Dec 2012 16:05:20 +0000 (17:05 +0100)
committerTakashi Iwai <tiwai@suse.de>
Sat, 12 Jan 2013 07:34:24 +0000 (08:34 +0100)
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 <tiwai@suse.de>
sound/pci/hda/hda_generic.c
sound/pci/hda/hda_generic.h

index d4cb9df6e5b3b44c41e27afb64e6cca2608d72c4..43acf3d806619b1b037e92f7026f6e8e44cf8a51 100644 (file)
@@ -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) {
index a406cd4cf07202e51d675acaa228f9924779ed3e..6365140924afbf772ec2de39e45e15c2ed1679de 100644 (file)
@@ -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 */