]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
ASoC: rcar: Convert to SYSTEM_SLEEP_PM_OPS()
authorTakashi Iwai <tiwai@suse.de>
Mon, 17 Mar 2025 09:55:36 +0000 (10:55 +0100)
committerMark Brown <broonie@kernel.org>
Mon, 17 Mar 2025 10:14:52 +0000 (10:14 +0000)
Use the newer SYSTEM_SLEEP_PM_OPS() macro instead of
SET_SYSTEM_SLEEP_PM_OPS() together with pm_ptr(), which allows us to
drop ugly __maybe_unused attributes.

This optimizes slightly when CONFIG_PM is disabled, too.

Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Reviewed-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Link: https://patch.msgid.link/20250317095603.20073-75-tiwai@suse.de
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/renesas/rcar/core.c

index f3f0c3f0bb9f5cdd85e0747c4c338fe92f1095f8..30afc942d3818209e74ce2bd188fc3ae6e3f52f8 100644 (file)
@@ -2059,7 +2059,7 @@ static void rsnd_remove(struct platform_device *pdev)
                remove_func[i](priv);
 }
 
-static int __maybe_unused rsnd_suspend(struct device *dev)
+static int rsnd_suspend(struct device *dev)
 {
        struct rsnd_priv *priv = dev_get_drvdata(dev);
 
@@ -2068,7 +2068,7 @@ static int __maybe_unused rsnd_suspend(struct device *dev)
        return 0;
 }
 
-static int __maybe_unused rsnd_resume(struct device *dev)
+static int rsnd_resume(struct device *dev)
 {
        struct rsnd_priv *priv = dev_get_drvdata(dev);
 
@@ -2076,13 +2076,13 @@ static int __maybe_unused rsnd_resume(struct device *dev)
 }
 
 static const struct dev_pm_ops rsnd_pm_ops = {
-       SET_SYSTEM_SLEEP_PM_OPS(rsnd_suspend, rsnd_resume)
+       SYSTEM_SLEEP_PM_OPS(rsnd_suspend, rsnd_resume)
 };
 
 static struct platform_driver rsnd_driver = {
        .driver = {
                .name   = "rcar_sound",
-               .pm     = &rsnd_pm_ops,
+               .pm     = pm_ptr(&rsnd_pm_ops),
                .of_match_table = rsnd_of_match,
        },
        .probe          = rsnd_probe,