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_sigmatel.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_sigmatel.c')
-rw-r--r-- | sound/pci/hda/patch_sigmatel.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c index 8f80796c366f..fcf4c7142103 100644 --- a/sound/pci/hda/patch_sigmatel.c +++ b/sound/pci/hda/patch_sigmatel.c | |||
@@ -4934,7 +4934,7 @@ static void stac927x_proc_hook(struct snd_info_buffer *buffer, | |||
4934 | #define stac927x_proc_hook NULL | 4934 | #define stac927x_proc_hook NULL |
4935 | #endif | 4935 | #endif |
4936 | 4936 | ||
4937 | #ifdef SND_HDA_NEEDS_RESUME | 4937 | #ifdef CONFIG_PM |
4938 | static int stac92xx_pre_resume(struct hda_codec *codec) | 4938 | static int stac92xx_pre_resume(struct hda_codec *codec) |
4939 | { | 4939 | { |
4940 | struct sigmatel_spec *spec = codec->spec; | 4940 | struct sigmatel_spec *spec = codec->spec; |
@@ -5030,7 +5030,7 @@ static int stac92xx_suspend(struct hda_codec *codec, pm_message_t state) | |||
5030 | stac92xx_shutup(codec); | 5030 | stac92xx_shutup(codec); |
5031 | return 0; | 5031 | return 0; |
5032 | } | 5032 | } |
5033 | #endif | 5033 | #endif /* CONFIG_PM */ |
5034 | 5034 | ||
5035 | static const struct hda_codec_ops stac92xx_patch_ops = { | 5035 | static const struct hda_codec_ops stac92xx_patch_ops = { |
5036 | .build_controls = stac92xx_build_controls, | 5036 | .build_controls = stac92xx_build_controls, |
@@ -5038,7 +5038,7 @@ static const struct hda_codec_ops stac92xx_patch_ops = { | |||
5038 | .init = stac92xx_init, | 5038 | .init = stac92xx_init, |
5039 | .free = stac92xx_free, | 5039 | .free = stac92xx_free, |
5040 | .unsol_event = stac92xx_unsol_event, | 5040 | .unsol_event = stac92xx_unsol_event, |
5041 | #ifdef SND_HDA_NEEDS_RESUME | 5041 | #ifdef CONFIG_PM |
5042 | .suspend = stac92xx_suspend, | 5042 | .suspend = stac92xx_suspend, |
5043 | .resume = stac92xx_resume, | 5043 | .resume = stac92xx_resume, |
5044 | .pre_resume = stac92xx_pre_resume, | 5044 | .pre_resume = stac92xx_pre_resume, |