| Message ID | 20241001163106.4169421-1-han.xu@nxp.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/2] mtd: nand: raw: gpmi: switch to SYSTEM_SLEEP_PM_OPS | expand |
On Tue, Oct 1, 2024 at 1:32 PM Han Xu <han.xu@nxp.com> wrote: > 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) > }; You missed to change .pm = &gpmi_pm_ops, to .pm = pm_ptr(&gpmi_pm_ops),
diff --git a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c index e1b515304e3c..b7a05ca4409c 100644 --- a/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c +++ b/drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c @@ -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,8 +2864,8 @@ 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 = {
Replace the SET_SYSTEM_SLEEP_PM_OPS with modern SYSTEM_SLEEP_PM_OPS alternatives. Signed-off-by: Han Xu <han.xu@nxp.com> --- drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)