diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-10-19 15:51:07 +0300 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-10-19 15:51:12 +0300 |
| commit | 87543ce5030a17ff5056668d7e6c433168c63bb5 (patch) | |
| tree | bf0ed8d7cb63986bd2ca59107cb8729f12b1d38a /sound/pci/hda/cs35l56_hda.c | |
| parent | 2b17b489e47a956c8e93c8f1bcabb0343c851d90 (diff) | |
| parent | 8e13caa2150b5a1287a1900952d3d7e04363f921 (diff) | |
| download | linux-87543ce5030a17ff5056668d7e6c433168c63bb5.tar.xz | |
Merge branch 'for-linus' into for-next
For applying HD-audio EPROBE_DEFER series cleanly.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda/cs35l56_hda.c')
| -rw-r--r-- | sound/pci/hda/cs35l56_hda.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/pci/hda/cs35l56_hda.c b/sound/pci/hda/cs35l56_hda.c index d3cfdad7dd76..b61e1de8c4bf 100644 --- a/sound/pci/hda/cs35l56_hda.c +++ b/sound/pci/hda/cs35l56_hda.c @@ -106,7 +106,7 @@ static void cs35l56_hda_playback_hook(struct device *dev, int action) } } -static int __maybe_unused cs35l56_hda_runtime_suspend(struct device *dev) +static int cs35l56_hda_runtime_suspend(struct device *dev) { struct cs35l56_hda *cs35l56 = dev_get_drvdata(dev); @@ -116,7 +116,7 @@ static int __maybe_unused cs35l56_hda_runtime_suspend(struct device *dev) return cs35l56_runtime_suspend_common(&cs35l56->base); } -static int __maybe_unused cs35l56_hda_runtime_resume(struct device *dev) +static int cs35l56_hda_runtime_resume(struct device *dev) { struct cs35l56_hda *cs35l56 = dev_get_drvdata(dev); int ret; @@ -1026,7 +1026,7 @@ void cs35l56_hda_remove(struct device *dev) EXPORT_SYMBOL_NS_GPL(cs35l56_hda_remove, SND_HDA_SCODEC_CS35L56); const struct dev_pm_ops cs35l56_hda_pm_ops = { - SET_RUNTIME_PM_OPS(cs35l56_hda_runtime_suspend, cs35l56_hda_runtime_resume, NULL) + RUNTIME_PM_OPS(cs35l56_hda_runtime_suspend, cs35l56_hda_runtime_resume, NULL) SYSTEM_SLEEP_PM_OPS(cs35l56_hda_system_suspend, cs35l56_hda_system_resume) LATE_SYSTEM_SLEEP_PM_OPS(cs35l56_hda_system_suspend_late, cs35l56_hda_system_resume_early) |