Commit 58e22201f8a4c270300c589083ff9117b3b8274c
1 parent
28cb72e5b8
Exists in
master
and in
20 other branches
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>
Showing 1 changed file with 0 additions and 10 deletions Side-by-side Diff
sound/pci/hda/patch_sigmatel.c
| ... | ... | @@ -3711,14 +3711,6 @@ |
| 3711 | 3711 | #endif |
| 3712 | 3712 | |
| 3713 | 3713 | #ifdef CONFIG_PM |
| 3714 | -static 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 | - | |
| 3722 | 3714 | static int stac_suspend(struct hda_codec *codec) |
| 3723 | 3715 | { |
| 3724 | 3716 | stac_shutup(codec); |
| ... | ... | @@ -3747,7 +3739,6 @@ |
| 3747 | 3739 | } |
| 3748 | 3740 | #else |
| 3749 | 3741 | #define stac_suspend NULL |
| 3750 | -#define stac_resume NULL | |
| 3751 | 3742 | #define stac_set_power_state NULL |
| 3752 | 3743 | #endif /* CONFIG_PM */ |
| 3753 | 3744 | |
| ... | ... | @@ -3759,7 +3750,6 @@ |
| 3759 | 3750 | .unsol_event = snd_hda_jack_unsol_event, |
| 3760 | 3751 | #ifdef CONFIG_PM |
| 3761 | 3752 | .suspend = stac_suspend, |
| 3762 | - .resume = stac_resume, | |
| 3763 | 3753 | #endif |
| 3764 | 3754 | .reboot_notify = stac_shutup, |
| 3765 | 3755 | }; |