ASoC: SOF: of: Convert to EXPORT_DEV_PM_OPS()

Use the newer EXPORT_DEV_PM_OPS() macro together with pm_ptr().

This optimizes slightly when CONFIG_PM is disabled, too.

Cc: sound-open-firmware@alsa-project.org
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/20250317095603.20073-80-tiwai@suse.de
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/imx/imx8.c b/sound/soc/sof/imx/imx8.c
index 4be4c569b58360f0a718ebd3be83b386b20b5679..ab07512e511d8bafdff40e44b3979b2ecbd28d87 100644 (file)
--- a/sound/soc/sof/imx/imx8.c
+++ b/sound/soc/sof/imx/imx8.c
@@ -456,7 +456,7 @@ static struct platform_driver snd_sof_of_imx8_driver = {
        .remove = sof_of_remove,
        .driver = {
                .name = "sof-audio-of-imx8",
-               .pm = &sof_of_pm,
+               .pm = pm_ptr(&sof_of_pm),
                .of_match_table = sof_of_imx8_ids,
        },
 };

diff --git a/sound/soc/sof/imx/imx9.c b/sound/soc/sof/imx/imx9.c
index 598675d4350a92ba170f7554e5c7492e55179968..853155d5990a36f308ea7c3e03b89268e2260d64 100644 (file)
--- a/sound/soc/sof/imx/imx9.c
+++ b/sound/soc/sof/imx/imx9.c
@@ -126,7 +126,7 @@ static struct platform_driver snd_sof_of_imx9_driver = {
        .remove = sof_of_remove,
        .driver = {
                .name = "sof-audio-of-imx9",
-               .pm = &sof_of_pm,
+               .pm = pm_ptr(&sof_of_pm),
                .of_match_table = sof_of_imx9_ids,
        },
 };

diff --git a/sound/soc/sof/mediatek/mt8186/mt8186.c b/sound/soc/sof/mediatek/mt8186/mt8186.c
index 31437fdd4e922a29b349d32e66098bc1b462770f..18144d9504e149cd36788402aabac8f904dd41ef 100644 (file)
--- a/sound/soc/sof/mediatek/mt8186/mt8186.c
+++ b/sound/soc/sof/mediatek/mt8186/mt8186.c
@@ -660,7 +660,7 @@ static struct platform_driver snd_sof_of_mt8186_driver = {
        .shutdown = sof_of_shutdown,
        .driver = {
        .name = "sof-audio-of-mt8186",
-               .pm = &sof_of_pm,
+               .pm = pm_ptr(&sof_of_pm),
                .of_match_table = sof_of_mt8186_ids,
        },
 };

diff --git a/sound/soc/sof/mediatek/mt8195/mt8195.c b/sound/soc/sof/mediatek/mt8195/mt8195.c
index 371563d7ce7952303e47be65dadda2f3996a1271..821f43a3974a1b8715836afb80505df8064776a1 100644 (file)
--- a/sound/soc/sof/mediatek/mt8195/mt8195.c
+++ b/sound/soc/sof/mediatek/mt8195/mt8195.c
@@ -616,7 +616,7 @@ static struct platform_driver snd_sof_of_mt8195_driver = {
        .shutdown = sof_of_shutdown,
        .driver = {
        .name = "sof-audio-of-mt8195",
-               .pm = &sof_of_pm,
+               .pm = pm_ptr(&sof_of_pm),
                .of_match_table = sof_of_mt8195_ids,
        },
 };

diff --git a/sound/soc/sof/sof-of-dev.c b/sound/soc/sof/sof-of-dev.c
index fb8c8a14d885a74cbb0d2c4034316ab4018fc7c0..3ccfcfb142b7ae5045ba3408e1933f455c3fee71 100644 (file)
--- a/sound/soc/sof/sof-of-dev.c
+++ b/sound/soc/sof/sof-of-dev.c
@@ -30,14 +30,12 @@ static char *tplg_filename;
 module_param(tplg_filename, charp, 0444);
 MODULE_PARM_DESC(tplg_filename, "deprecated - moved to snd-sof module.");
 
-const struct dev_pm_ops sof_of_pm = {
+EXPORT_DEV_PM_OPS(sof_of_pm) = {
        .prepare = snd_sof_prepare,
        .complete = snd_sof_complete,
-       SET_SYSTEM_SLEEP_PM_OPS(snd_sof_suspend, snd_sof_resume)
-       SET_RUNTIME_PM_OPS(snd_sof_runtime_suspend, snd_sof_runtime_resume,
-                          NULL)
+       SYSTEM_SLEEP_PM_OPS(snd_sof_suspend, snd_sof_resume)
+       RUNTIME_PM_OPS(snd_sof_runtime_suspend, snd_sof_runtime_resume, NULL)
 };
-EXPORT_SYMBOL(sof_of_pm);
 
 static void sof_of_probe_complete(struct device *dev)
 {