diff options
author | Takashi Iwai <tiwai@suse.de> | 2012-08-24 18:38:08 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-08-30 07:50:13 -0700 |
commit | 83012a7ccbb90dee33c97a004b3e374f988612af (patch) | |
tree | 4e6e4c6f1f21150a4c82cbbefb97995cda924d17 /sound/pci/hda/patch_conexant.c | |
parent | 432c641e013d6e294e2ddf06d32a610eb1d4d856 (diff) | |
download | linux-83012a7ccbb90dee33c97a004b3e374f988612af.tar.gz linux-83012a7ccbb90dee33c97a004b3e374f988612af.tar.bz2 linux-83012a7ccbb90dee33c97a004b3e374f988612af.zip |
ALSA: hda - Clean up CONFIG_SND_HDA_POWER_SAVE
CONFIG_SND_HDA_POWER_SAVE is no longer an experimental feature and its
behavior can be well controlled via the default value and module
parameter. Let's just replace it with the standard CONFIG_PM.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_conexant.c')
-rw-r--r-- | sound/pci/hda/patch_conexant.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c index 172895a8add4..7d70210d7623 100644 --- a/sound/pci/hda/patch_conexant.c +++ b/sound/pci/hda/patch_conexant.c @@ -553,7 +553,7 @@ static int conexant_build_controls(struct hda_codec *codec) return 0; } -#ifdef CONFIG_SND_HDA_POWER_SAVE +#ifdef CONFIG_PM static int conexant_suspend(struct hda_codec *codec) { snd_hda_shutup_pins(codec); @@ -567,7 +567,7 @@ static const struct hda_codec_ops conexant_patch_ops = { .init = conexant_init, .free = conexant_free, .set_power_state = conexant_set_power, -#ifdef CONFIG_SND_HDA_POWER_SAVE +#ifdef CONFIG_PM .suspend = conexant_suspend, #endif .reboot_notify = snd_hda_shutup_pins, @@ -4395,7 +4395,7 @@ static const struct hda_codec_ops cx_auto_patch_ops = { .init = cx_auto_init, .free = conexant_free, .unsol_event = cx_auto_unsol_event, -#ifdef CONFIG_SND_HDA_POWER_SAVE +#ifdef CONFIG_PM .suspend = conexant_suspend, #endif .reboot_notify = snd_hda_shutup_pins, |