Skip to content

Commit

Permalink
ALSA: hda - Drop spec->channel_mode field from hda_gen_spec
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Takashi Iwai committed Jan 12, 2013
1 parent f873e53 commit 545502d
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 12 deletions.
10 changes: 0 additions & 10 deletions sound/pci/hda/hda_generic.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down
2 changes: 0 additions & 2 deletions sound/pci/hda/hda_generic.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 */

Expand Down

0 comments on commit 545502d

Please sign in to comment.