mtd: nand: raw: gpmi: switch to SYSTEM_SLEEP_PM_OPS
authorHan Xu <han.xu@nxp.com>
Mon, 7 Oct 2024 19:13:18 +0000 (14:13 -0500)
committerMiquel Raynal <miquel.raynal@bootlin.com>
Mon, 21 Oct 2024 09:24:37 +0000 (11:24 +0200)
Replace the SET_SYSTEM_SLEEP_PM_OPS with modern SYSTEM_SLEEP_PM_OPS
alternatives.

Signed-off-by: Han Xu <han.xu@nxp.com>
Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
Link: https://lore.kernel.org/linux-mtd/20241007191319.220775-1-han.xu@nxp.com
drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c

index e1b5153..a7d7967 100644 (file)
@@ -2811,7 +2811,6 @@ static void gpmi_nand_remove(struct platform_device *pdev)
        release_resources(this);
 }
 
-#ifdef CONFIG_PM_SLEEP
 static int gpmi_pm_suspend(struct device *dev)
 {
        struct gpmi_nand_data *this = dev_get_drvdata(dev);
@@ -2849,7 +2848,6 @@ static int gpmi_pm_resume(struct device *dev)
 
        return 0;
 }
-#endif /* CONFIG_PM_SLEEP */
 
 static int __maybe_unused gpmi_runtime_suspend(struct device *dev)
 {
@@ -2866,14 +2864,14 @@ static int __maybe_unused gpmi_runtime_resume(struct device *dev)
 }
 
 static const struct dev_pm_ops gpmi_pm_ops = {
-       SET_SYSTEM_SLEEP_PM_OPS(gpmi_pm_suspend, gpmi_pm_resume)
-       SET_RUNTIME_PM_OPS(gpmi_runtime_suspend, gpmi_runtime_resume, NULL)
+       SYSTEM_SLEEP_PM_OPS(gpmi_pm_suspend, gpmi_pm_resume)
+       RUNTIME_PM_OPS(gpmi_runtime_suspend, gpmi_runtime_resume, NULL)
 };
 
 static struct platform_driver gpmi_nand_driver = {
        .driver = {
                .name = "gpmi-nand",
-               .pm = &gpmi_pm_ops,
+               .pm = pm_ptr(&gpmi_pm_ops),
                .of_match_table = gpmi_nand_id_table,
        },
        .probe   = gpmi_nand_probe,