aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2013-06-25 03:27:19 -0400
committerTakashi Iwai <tiwai@suse.de>2013-06-25 03:27:19 -0400
commit58e22201f8a4c270300c589083ff9117b3b8274c (patch)
treef05e57683f5422ce79af406a8d5958b04f49eacc /sound/pci/hda
parent28cb72e5b86bb8340568c2ceb940eb165a9791b3 (diff)
ALSA: hda - Remove superfluous stac_resume()
The stac_resume() is exactly what the default resume code does, so we don't have to define and use it doubly. Let's cut it off. Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda')
-rw-r--r--sound/pci/hda/patch_sigmatel.c10
1 files changed, 0 insertions, 10 deletions
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index 9b6cb270dbe5..e2f83591161b 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -3711,14 +3711,6 @@ static void stac927x_proc_hook(struct snd_info_buffer *buffer,
3711#endif 3711#endif
3712 3712
3713#ifdef CONFIG_PM 3713#ifdef CONFIG_PM
3714static int stac_resume(struct hda_codec *codec)
3715{
3716 codec->patch_ops.init(codec);
3717 snd_hda_codec_resume_amp(codec);
3718 snd_hda_codec_resume_cache(codec);
3719 return 0;
3720}
3721
3722static int stac_suspend(struct hda_codec *codec) 3714static int stac_suspend(struct hda_codec *codec)
3723{ 3715{
3724 stac_shutup(codec); 3716 stac_shutup(codec);
@@ -3747,7 +3739,6 @@ static void stac_set_power_state(struct hda_codec *codec, hda_nid_t fg,
3747} 3739}
3748#else 3740#else
3749#define stac_suspend NULL 3741#define stac_suspend NULL
3750#define stac_resume NULL
3751#define stac_set_power_state NULL 3742#define stac_set_power_state NULL
3752#endif /* CONFIG_PM */ 3743#endif /* CONFIG_PM */
3753 3744
@@ -3759,7 +3750,6 @@ static const struct hda_codec_ops stac_patch_ops = {
3759 .unsol_event = snd_hda_jack_unsol_event, 3750 .unsol_event = snd_hda_jack_unsol_event,
3760#ifdef CONFIG_PM 3751#ifdef CONFIG_PM
3761 .suspend = stac_suspend, 3752 .suspend = stac_suspend,
3762 .resume = stac_resume,
3763#endif 3753#endif
3764 .reboot_notify = stac_shutup, 3754 .reboot_notify = stac_shutup,
3765}; 3755};