summaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2012-03-14 08:20:20 +0100
committerTakashi Iwai <tiwai@suse.de>2012-03-14 08:20:20 +0100
commit7907ae3e50613ae1c6d1a10f34fcd63f4123b93d (patch)
treed04617718b76508f941cbd29cba7ee9168303079 /sound/pci
parentf29735cbef4eb6072e5ae459b556f3a061efc47e (diff)
downloadop-kernel-dev-7907ae3e50613ae1c6d1a10f34fcd63f4123b93d.zip
op-kernel-dev-7907ae3e50613ae1c6d1a10f34fcd63f4123b93d.tar.gz
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 153b9ae..b064e59 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,
return 0;
}
-#ifdef CONFIG_SND_HDA_POWER_SAVE
static int stac_vrefout_set(struct hda_codec *codec,
hda_nid_t nid, unsigned int new_vref)
{
@@ -689,7 +688,6 @@ static int stac_vrefout_set(struct hda_codec *codec,
return 1;
}
-#endif
static unsigned int stac92xx_vref_set(struct hda_codec *codec,
hda_nid_t nid, unsigned int new_vref)
@@ -5011,7 +5009,6 @@ static int stac92xx_suspend(struct hda_codec *codec, pm_message_t state)
return 0;
}
-#ifdef CONFIG_SND_HDA_POWER_SAVE
static int stac92xx_pre_resume(struct hda_codec *codec)
{
struct sigmatel_spec *spec = codec->spec;
@@ -5046,7 +5043,6 @@ static void stac92xx_set_power_state(struct hda_codec *codec, hda_nid_t fg,
afg_power_state);
snd_hda_codec_set_power_to_all(codec, fg, power_state, true);
}
-#endif /* CONFIG_SND_HDA_POWER_SAVE */
#endif /* CONFIG_PM */
/* update mute-LED accoring to the master switch */
@@ -5583,7 +5579,6 @@ again:
spec->gpio_led,
spec->gpio_led_polarity);
-#ifdef CONFIG_SND_HDA_POWER_SAVE
if (spec->gpio_led) {
if (!spec->vref_mute_led_nid) {
spec->gpio_mask |= spec->gpio_led;
@@ -5595,7 +5590,6 @@ again:
}
codec->patch_ops.pre_resume = stac92xx_pre_resume;
}
-#endif
err = stac92xx_parse_auto_config(codec);
if (!err) {
@@ -5892,7 +5886,6 @@ again:
spec->gpio_led,
spec->gpio_led_polarity);
-#ifdef CONFIG_SND_HDA_POWER_SAVE
if (spec->gpio_led) {
if (!spec->vref_mute_led_nid) {
spec->gpio_mask |= spec->gpio_led;
@@ -5904,7 +5897,6 @@ again:
}
codec->patch_ops.pre_resume = stac92xx_pre_resume;
}
-#endif
spec->multiout.dac_nids = spec->dac_nids;
OpenPOWER on IntegriCloud