aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2011-11-02 16:40:06 -0400
committerTakashi Iwai <tiwai@suse.de>2011-11-02 16:40:06 -0400
commit112daa7a4c09059ae93e1a3de42e874c13a30728 (patch)
tree750bacd337a4a5e6c3e825c04213c4e58ba0dc1a /sound
parent1fa1757366783fb52e6e85c2d735db49b818d382 (diff)
ALSA: hda - Remove unused variables
Just clean-up what GCC caught. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/hda/patch_hdmi.c5
-rw-r--r--sound/pci/hda/patch_realtek.c3
-rw-r--r--sound/pci/hda/patch_via.c5
3 files changed, 1 insertions, 12 deletions
diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
index 342540128fb8..aac3bfacda3f 100644
--- a/sound/pci/hda/patch_hdmi.c
+++ b/sound/pci/hda/patch_hdmi.c
@@ -1006,7 +1006,6 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid)
1006 unsigned int caps, config; 1006 unsigned int caps, config;
1007 int pin_idx; 1007 int pin_idx;
1008 struct hdmi_spec_per_pin *per_pin; 1008 struct hdmi_spec_per_pin *per_pin;
1009 struct hdmi_eld *eld;
1010 int err; 1009 int err;
1011 1010
1012 caps = snd_hda_param_read(codec, pin_nid, AC_PAR_PIN_CAP); 1011 caps = snd_hda_param_read(codec, pin_nid, AC_PAR_PIN_CAP);
@@ -1023,7 +1022,6 @@ static int hdmi_add_pin(struct hda_codec *codec, hda_nid_t pin_nid)
1023 1022
1024 pin_idx = spec->num_pins; 1023 pin_idx = spec->num_pins;
1025 per_pin = &spec->pins[pin_idx]; 1024 per_pin = &spec->pins[pin_idx];
1026 eld = &per_pin->sink_eld;
1027 1025
1028 per_pin->pin_nid = pin_nid; 1026 per_pin->pin_nid = pin_nid;
1029 1027
@@ -1576,7 +1574,7 @@ static int nvhdmi_8ch_7x_pcm_prepare(struct hda_pcm_stream *hinfo,
1576 struct snd_pcm_substream *substream) 1574 struct snd_pcm_substream *substream)
1577{ 1575{
1578 int chs; 1576 int chs;
1579 unsigned int dataDCC1, dataDCC2, channel_id; 1577 unsigned int dataDCC2, channel_id;
1580 int i; 1578 int i;
1581 struct hdmi_spec *spec = codec->spec; 1579 struct hdmi_spec *spec = codec->spec;
1582 struct hda_spdif_out *spdif = 1580 struct hda_spdif_out *spdif =
@@ -1586,7 +1584,6 @@ static int nvhdmi_8ch_7x_pcm_prepare(struct hda_pcm_stream *hinfo,
1586 1584
1587 chs = substream->runtime->channels; 1585 chs = substream->runtime->channels;
1588 1586
1589 dataDCC1 = AC_DIG1_ENABLE | AC_DIG1_COPYRIGHT;
1590 dataDCC2 = 0x2; 1587 dataDCC2 = 0x2;
1591 1588
1592 /* turn off SPDIF once; otherwise the IEC958 bits won't be updated */ 1589 /* turn off SPDIF once; otherwise the IEC958 bits won't be updated */
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 4468cb7ea688..9543bc8aaef6 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -2661,7 +2661,6 @@ static int alc_auto_fill_adc_caps(struct hda_codec *codec)
2661 hda_nid_t *adc_nids = spec->private_adc_nids; 2661 hda_nid_t *adc_nids = spec->private_adc_nids;
2662 hda_nid_t *cap_nids = spec->private_capsrc_nids; 2662 hda_nid_t *cap_nids = spec->private_capsrc_nids;
2663 int max_nums = ARRAY_SIZE(spec->private_adc_nids); 2663 int max_nums = ARRAY_SIZE(spec->private_adc_nids);
2664 bool indep_capsrc = false;
2665 int i, nums = 0; 2664 int i, nums = 0;
2666 2665
2667 nid = codec->start_nid; 2666 nid = codec->start_nid;
@@ -2683,13 +2682,11 @@ static int alc_auto_fill_adc_caps(struct hda_codec *codec)
2683 break; 2682 break;
2684 if (type == AC_WID_AUD_SEL) { 2683 if (type == AC_WID_AUD_SEL) {
2685 cap_nids[nums] = src; 2684 cap_nids[nums] = src;
2686 indep_capsrc = true;
2687 break; 2685 break;
2688 } 2686 }
2689 n = snd_hda_get_conn_list(codec, src, &list); 2687 n = snd_hda_get_conn_list(codec, src, &list);
2690 if (n > 1) { 2688 if (n > 1) {
2691 cap_nids[nums] = src; 2689 cap_nids[nums] = src;
2692 indep_capsrc = true;
2693 break; 2690 break;
2694 } else if (n != 1) 2691 } else if (n != 1)
2695 break; 2692 break;
diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index 417d62ad3b96..0b020a93a8ed 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -3700,13 +3700,8 @@ static const struct hda_verb vt1812_init_verbs[] = {
3700static void set_widgets_power_state_vt1812(struct hda_codec *codec) 3700static void set_widgets_power_state_vt1812(struct hda_codec *codec)
3701{ 3701{
3702 struct via_spec *spec = codec->spec; 3702 struct via_spec *spec = codec->spec;
3703 int imux_is_smixer =
3704 snd_hda_codec_read(codec, 0x13, 0, AC_VERB_GET_CONNECT_SEL, 0x00) == 3;
3705 unsigned int parm; 3703 unsigned int parm;
3706 unsigned int present; 3704 unsigned int present;
3707 /* MUX10 (1eh) = stereo mixer */
3708 imux_is_smixer =
3709 snd_hda_codec_read(codec, 0x1e, 0, AC_VERB_GET_CONNECT_SEL, 0x00) == 5;
3710 /* inputs */ 3705 /* inputs */
3711 /* PW 5/6/7 (29h/2ah/2bh) */ 3706 /* PW 5/6/7 (29h/2ah/2bh) */
3712 parm = AC_PWRST_D3; 3707 parm = AC_PWRST_D3;