]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ALSA: ac97: Convert to RUNTIME_PM_OPS() macro
authorTakashi Iwai <tiwai@suse.de>
Thu, 13 Mar 2025 17:07:19 +0000 (18:07 +0100)
committerTakashi Iwai <tiwai@suse.de>
Fri, 14 Mar 2025 10:07:13 +0000 (11:07 +0100)
Use a newer RUNTIME_PM_OPS() macro instead of SET_RUNTIME_PM_OPS()
together with pm_ptr(), which makes CONFIG_PM ifdefs superfluous.

This optimizes slightly when CONFIG_PM is disabled, too.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://patch.msgid.link/20250313170731.26943-2-tiwai@suse.de
sound/ac97/bus.c

index 8dfffdc101a2565869a0dc56d5d366f8d0f2c6d0..47c6787158a777c1ffb6e042587c6796ec1bf30b 100644 (file)
@@ -387,7 +387,6 @@ void snd_ac97_controller_unregister(struct ac97_controller *ac97_ctrl)
 }
 EXPORT_SYMBOL_GPL(snd_ac97_controller_unregister);
 
-#ifdef CONFIG_PM
 static int ac97_pm_runtime_suspend(struct device *dev)
 {
        struct ac97_codec_device *codec = to_ac97_device(dev);
@@ -419,7 +418,6 @@ static int ac97_pm_runtime_resume(struct device *dev)
 
        return pm_generic_runtime_resume(dev);
 }
-#endif /* CONFIG_PM */
 
 static const struct dev_pm_ops ac97_pm = {
        .suspend        = pm_generic_suspend,
@@ -428,10 +426,7 @@ static const struct dev_pm_ops ac97_pm = {
        .thaw           = pm_generic_thaw,
        .poweroff       = pm_generic_poweroff,
        .restore        = pm_generic_restore,
-       SET_RUNTIME_PM_OPS(
-               ac97_pm_runtime_suspend,
-               ac97_pm_runtime_resume,
-               NULL)
+       RUNTIME_PM_OPS(ac97_pm_runtime_suspend, ac97_pm_runtime_resume, NULL)
 };
 
 static int ac97_get_enable_clk(struct ac97_codec_device *adev)
@@ -535,7 +530,7 @@ const struct bus_type ac97_bus_type = {
        .name           = "ac97bus",
        .dev_groups     = ac97_dev_groups,
        .match          = ac97_bus_match,
-       .pm             = &ac97_pm,
+       .pm             = pm_ptr(&ac97_pm),
        .probe          = ac97_bus_probe,
        .remove         = ac97_bus_remove,
 };