Skip to content

Commit

Permalink
ALSA: hda - Fix build of patch_sigmatel.c without CONFIG_SND_HDA_POWE…
Browse files Browse the repository at this point in the history
…R_SAVE

Now the mute-LED is controlled without powersave hack, and the ifdefs must
be removed.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai committed Mar 14, 2012
1 parent f29735c commit 7907ae3
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions sound/pci/hda/patch_sigmatel.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand All @@ -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)
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 */
Expand Down Expand Up @@ -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;
Expand All @@ -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) {
Expand Down Expand Up @@ -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;
Expand All @@ -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;

Expand Down

0 comments on commit 7907ae3

Please sign in to comment.