From abd0d444d8e64a6d1c4b2dd6dd4e1d5fa5bdf824 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 14 Mar 2012 08:20:20 +0100 Subject: [PATCH] --- yaml --- r: 293125 b: refs/heads/master c: 7907ae3e50613ae1c6d1a10f34fcd63f4123b93d h: refs/heads/master i: 293123: 1de5c302f669863e55a7228dd37dffb38a9d6bd3 v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_sigmatel.c | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 806db971104d..5852a95b2b6a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f29735cbef4eb6072e5ae459b556f3a061efc47e +refs/heads/master: 7907ae3e50613ae1c6d1a10f34fcd63f4123b93d diff --git a/trunk/sound/pci/hda/patch_sigmatel.c b/trunk/sound/pci/hda/patch_sigmatel.c index 153b9ae46ba4..b064e595bb60 100644 --- a/trunk/sound/pci/hda/patch_sigmatel.c +++ b/trunk/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 @@ static int patch_stac92hd83xxx(struct hda_codec *codec) 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 @@ static int patch_stac92hd83xxx(struct hda_codec *codec) } codec->patch_ops.pre_resume = stac92xx_pre_resume; } -#endif err = stac92xx_parse_auto_config(codec); if (!err) { @@ -5892,7 +5886,6 @@ static int patch_stac92hd71bxx(struct hda_codec *codec) 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 @@ static int patch_stac92hd71bxx(struct hda_codec *codec) } codec->patch_ops.pre_resume = stac92xx_pre_resume; } -#endif spec->multiout.dac_nids = spec->dac_nids;