aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-03-14 03:20:20 -0400
committerTakashi Iwai <tiwai@suse.de>2012-03-14 03:20:20 -0400
commit7907ae3e50613ae1c6d1a10f34fcd63f4123b93d (patch)
treed04617718b76508f941cbd29cba7ee9168303079 /sound/pci
parentf29735cbef4eb6072e5ae459b556f3a061efc47e (diff)
ALSA: hda - Fix build of patch_sigmatel.c without CONFIG_SND_HDA_POWER_SAVE
Now the mute-LED is controlled without powersave hack, and the ifdefs must be removed. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_sigmatel.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 153b9ae46ba..b064e595bb6 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -665,7 +665,6 @@ static int stac92xx_smux_enum_put(struct snd_kcontrol *kcontrol,
665 return 0; 665 return 0;
666} 666}
667 667
668#ifdef CONFIG_SND_HDA_POWER_SAVE
669static int stac_vrefout_set(struct hda_codec *codec, 668static int stac_vrefout_set(struct hda_codec *codec,
670 hda_nid_t nid, unsigned int new_vref) 669 hda_nid_t nid, unsigned int new_vref)
671{ 670{
@@ -689,7 +688,6 @@ static int stac_vrefout_set(struct hda_codec *codec,
689 688
690 return 1; 689 return 1;
691} 690}
692#endif
693 691
694static unsigned int stac92xx_vref_set(struct hda_codec *codec, 692static unsigned int stac92xx_vref_set(struct hda_codec *codec,
695 hda_nid_t nid, unsigned int new_vref) 693 hda_nid_t nid, unsigned int new_vref)
@@ -5011,7 +5009,6 @@ static int stac92xx_suspend(struct hda_codec *codec, pm_message_t state)
5011 return 0; 5009 return 0;
5012} 5010}
5013 5011
5014#ifdef CONFIG_SND_HDA_POWER_SAVE
5015static int stac92xx_pre_resume(struct hda_codec *codec) 5012static int stac92xx_pre_resume(struct hda_codec *codec)
5016{ 5013{
5017 struct sigmatel_spec *spec = codec->spec; 5014 struct sigmatel_spec *spec = codec->spec;
@@ -5046,7 +5043,6 @@ static void stac92xx_set_power_state(struct hda_codec *codec, hda_nid_t fg,
5046 afg_power_state); 5043 afg_power_state);
5047 snd_hda_codec_set_power_to_all(codec, fg, power_state, true); 5044 snd_hda_codec_set_power_to_all(codec, fg, power_state, true);
5048} 5045}
5049#endif /* CONFIG_SND_HDA_POWER_SAVE */
5050#endif /* CONFIG_PM */ 5046#endif /* CONFIG_PM */
5051 5047
5052/* update mute-LED accoring to the master switch */ 5048/* update mute-LED accoring to the master switch */
@@ -5583,7 +5579,6 @@ again:
5583 spec->gpio_led, 5579 spec->gpio_led,
5584 spec->gpio_led_polarity); 5580 spec->gpio_led_polarity);
5585 5581
5586#ifdef CONFIG_SND_HDA_POWER_SAVE
5587 if (spec->gpio_led) { 5582 if (spec->gpio_led) {
5588 if (!spec->vref_mute_led_nid) { 5583 if (!spec->vref_mute_led_nid) {
5589 spec->gpio_mask |= spec->gpio_led; 5584 spec->gpio_mask |= spec->gpio_led;
@@ -5595,7 +5590,6 @@ again:
5595 } 5590 }
5596 codec->patch_ops.pre_resume = stac92xx_pre_resume; 5591 codec->patch_ops.pre_resume = stac92xx_pre_resume;
5597 } 5592 }
5598#endif
5599 5593
5600 err = stac92xx_parse_auto_config(codec); 5594 err = stac92xx_parse_auto_config(codec);
5601 if (!err) { 5595 if (!err) {
@@ -5892,7 +5886,6 @@ again:
5892 spec->gpio_led, 5886 spec->gpio_led,
5893 spec->gpio_led_polarity); 5887 spec->gpio_led_polarity);
5894 5888
5895#ifdef CONFIG_SND_HDA_POWER_SAVE
5896 if (spec->gpio_led) { 5889 if (spec->gpio_led) {
5897 if (!spec->vref_mute_led_nid) { 5890 if (!spec->vref_mute_led_nid) {
5898 spec->gpio_mask |= spec->gpio_led; 5891 spec->gpio_mask |= spec->gpio_led;
@@ -5904,7 +5897,6 @@ again:
5904 } 5897 }
5905 codec->patch_ops.pre_resume = stac92xx_pre_resume; 5898 codec->patch_ops.pre_resume = stac92xx_pre_resume;
5906 } 5899 }
5907#endif
5908 5900
5909 spec->multiout.dac_nids = spec->dac_nids; 5901 spec->multiout.dac_nids = spec->dac_nids;
5910 5902