hwrng: imx-rngc - switch to DEFINE_SIMPLE_DEV_PM_OPS

SIMPLE_DEV_PM_OPS is deprecated, replace it with DEFINE_SIMPLE_DEV_PM_OPS
and use pm_sleep_ptr for setting the driver's pm routines. We can now
remove the __maybe_unused qualifier in the suspend and resume functions.

Signed-off-by: Martin Kaiser <martin@kaiser.cx>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/char/hw_random/imx-rngc.c b/drivers/char/hw_random/imx-rngc.c
index e5a9dee..bf07f17 100644 (file)
--- a/drivers/char/hw_random/imx-rngc.c
+++ b/drivers/char/hw_random/imx-rngc.c
@@ -298,7 +298,7 @@ static int __init imx_rngc_probe(struct platform_device *pdev)
        return 0;
 }
 
-static int __maybe_unused imx_rngc_suspend(struct device *dev)
+static int imx_rngc_suspend(struct device *dev)
 {
        struct imx_rngc *rngc = dev_get_drvdata(dev);
 
@@ -307,7 +307,7 @@ static int __maybe_unused imx_rngc_suspend(struct device *dev)
        return 0;
 }
 
-static int __maybe_unused imx_rngc_resume(struct device *dev)
+static int imx_rngc_resume(struct device *dev)
 {
        struct imx_rngc *rngc = dev_get_drvdata(dev);
 
@@ -316,7 +316,7 @@ static int __maybe_unused imx_rngc_resume(struct device *dev)
        return 0;
 }
 
-static SIMPLE_DEV_PM_OPS(imx_rngc_pm_ops, imx_rngc_suspend, imx_rngc_resume);
+static DEFINE_SIMPLE_DEV_PM_OPS(imx_rngc_pm_ops, imx_rngc_suspend, imx_rngc_resume);
 
 static const struct of_device_id imx_rngc_dt_ids[] = {
        { .compatible = "fsl,imx25-rngb" },
@@ -327,7 +327,7 @@ MODULE_DEVICE_TABLE(of, imx_rngc_dt_ids);
 static struct platform_driver imx_rngc_driver = {
        .driver = {
                .name = KBUILD_MODNAME,
-               .pm = &imx_rngc_pm_ops,
+               .pm = pm_sleep_ptr(&imx_rngc_pm_ops),
                .of_match_table = imx_rngc_dt_ids,
        },
 };