diff options
author | Takashi Iwai <tiwai@suse.de> | 2011-07-26 03:52:50 -0400 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2011-07-26 11:21:18 -0400 |
commit | 2a43952a99072f43c92355882b7965c8762ae3f3 (patch) | |
tree | d51d4f3623d5f9fd6682ed0823ed8bdf05b76b20 /sound/pci/hda/patch_analog.c | |
parent | 7df1ce1a8197a4afec78584f56e74ab84dcab97c (diff) |
ALSA: hda - Make CONFIG_SND_HDA_POWER_SAVE depending on CONFIG_PM
It makes little sense to enable power-saving without PM.
This removes SND_HDA_NEEDS_RESUME define so that we can use CONFIG_PM
in all places.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/patch_analog.c')
-rw-r--r-- | sound/pci/hda/patch_analog.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sound/pci/hda/patch_analog.c b/sound/pci/hda/patch_analog.c index 1362c8ba4d1f..8648917acffb 100644 --- a/sound/pci/hda/patch_analog.c +++ b/sound/pci/hda/patch_analog.c | |||
@@ -563,7 +563,7 @@ static void ad198x_free(struct hda_codec *codec) | |||
563 | snd_hda_detach_beep_device(codec); | 563 | snd_hda_detach_beep_device(codec); |
564 | } | 564 | } |
565 | 565 | ||
566 | #ifdef SND_HDA_NEEDS_RESUME | 566 | #ifdef CONFIG_PM |
567 | static int ad198x_suspend(struct hda_codec *codec, pm_message_t state) | 567 | static int ad198x_suspend(struct hda_codec *codec, pm_message_t state) |
568 | { | 568 | { |
569 | ad198x_shutup(codec); | 569 | ad198x_shutup(codec); |
@@ -579,7 +579,7 @@ static const struct hda_codec_ops ad198x_patch_ops = { | |||
579 | #ifdef CONFIG_SND_HDA_POWER_SAVE | 579 | #ifdef CONFIG_SND_HDA_POWER_SAVE |
580 | .check_power_status = ad198x_check_power_status, | 580 | .check_power_status = ad198x_check_power_status, |
581 | #endif | 581 | #endif |
582 | #ifdef SND_HDA_NEEDS_RESUME | 582 | #ifdef CONFIG_PM |
583 | .suspend = ad198x_suspend, | 583 | .suspend = ad198x_suspend, |
584 | #endif | 584 | #endif |
585 | .reboot_notify = ad198x_shutup, | 585 | .reboot_notify = ad198x_shutup, |