pinctrl: mediatek: Switch to use no-IRQ PM helpers

Since pm.h provides a helper for system no-IRQ PM callbacks,
switch the driver to use it instead of open coded variant.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Link: https://lore.kernel.org/r/20231122144744.2222207-1-andriy.shevchenko@linux.intel.com
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt2701.c b/drivers/pinctrl/mediatek/pinctrl-mt2701.c
index 5fb377c..6b1c712 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt2701.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt2701.c
@@ -533,7 +533,7 @@ static struct platform_driver mtk_pinctrl_driver = {
        .driver = {
                .name = "mediatek-mt2701-pinctrl",
                .of_match_table = mt2701_pctrl_match,
-               .pm = &mtk_eint_pm_ops,
+               .pm = pm_sleep_ptr(&mtk_eint_pm_ops),
        },
 };
 

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt2712.c b/drivers/pinctrl/mediatek/pinctrl-mt2712.c
index 8a6daa0..bb7394a 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt2712.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt2712.c
@@ -581,7 +581,7 @@ static struct platform_driver mtk_pinctrl_driver = {
        .driver = {
                .name = "mediatek-mt2712-pinctrl",
                .of_match_table = mt2712_pctrl_match,
-               .pm = &mtk_eint_pm_ops,
+               .pm = pm_sleep_ptr(&mtk_eint_pm_ops),
        },
 };
 

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt6795.c b/drivers/pinctrl/mediatek/pinctrl-mt6795.c
index 01e855c..ee3ae3d 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt6795.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt6795.c
@@ -612,7 +612,7 @@ static struct platform_driver mt6795_pinctrl_driver = {
        .driver = {
                .name = "mt6795-pinctrl",
                .of_match_table = mt6795_pctrl_match,
-               .pm = &mtk_paris_pinctrl_pm_ops,
+               .pm = pm_sleep_ptr(&mtk_paris_pinctrl_pm_ops),
        },
        .probe = mtk_paris_pinctrl_probe,
 };

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8167.c b/drivers/pinctrl/mediatek/pinctrl-mt8167.c
index ba7f30c..143c266 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt8167.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8167.c
@@ -334,7 +334,7 @@ static struct platform_driver mtk_pinctrl_driver = {
        .driver = {
                .name = "mediatek-mt8167-pinctrl",
                .of_match_table = mt8167_pctrl_match,
-               .pm = &mtk_eint_pm_ops,
+               .pm = pm_sleep_ptr(&mtk_eint_pm_ops),
        },
 };
 

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8173.c b/drivers/pinctrl/mediatek/pinctrl-mt8173.c
index 455eec0..b214dee 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt8173.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8173.c
@@ -347,7 +347,7 @@ static struct platform_driver mtk_pinctrl_driver = {
        .driver = {
                .name = "mediatek-mt8173-pinctrl",
                .of_match_table = mt8173_pctrl_match,
-               .pm = &mtk_eint_pm_ops,
+               .pm = pm_sleep_ptr(&mtk_eint_pm_ops),
        },
 };
 

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8183.c b/drivers/pinctrl/mediatek/pinctrl-mt8183.c
index ddc48b7..93e482c 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt8183.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8183.c
@@ -576,7 +576,7 @@ static struct platform_driver mt8183_pinctrl_driver = {
        .driver = {
                .name = "mt8183-pinctrl",
                .of_match_table = mt8183_pinctrl_of_match,
-               .pm = &mtk_paris_pinctrl_pm_ops,
+               .pm = pm_sleep_ptr(&mtk_paris_pinctrl_pm_ops),
        },
        .probe = mtk_paris_pinctrl_probe,
 };

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8186.c b/drivers/pinctrl/mediatek/pinctrl-mt8186.c
index a02f7c3..7be5915 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt8186.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8186.c
@@ -1255,7 +1255,7 @@ static struct platform_driver mt8186_pinctrl_driver = {
        .driver = {
                .name = "mt8186-pinctrl",
                .of_match_table = mt8186_pinctrl_of_match,
-               .pm = &mtk_paris_pinctrl_pm_ops,
+               .pm = pm_sleep_ptr(&mtk_paris_pinctrl_pm_ops),
        },
        .probe = mtk_paris_pinctrl_probe,
 };

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8188.c b/drivers/pinctrl/mediatek/pinctrl-mt8188.c
index c067e04..3975e99 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt8188.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8188.c
@@ -1658,7 +1658,7 @@ static struct platform_driver mt8188_pinctrl_driver = {
        .driver = {
                .name = "mt8188-pinctrl",
                .of_match_table = mt8188_pinctrl_of_match,
-               .pm = &mtk_paris_pinctrl_pm_ops
+               .pm = pm_sleep_ptr(&mtk_paris_pinctrl_pm_ops)
        },
        .probe = mtk_paris_pinctrl_probe,
 };

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8192.c b/drivers/pinctrl/mediatek/pinctrl-mt8192.c
index dee1b3a..e3a7638 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt8192.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8192.c
@@ -1420,7 +1420,7 @@ static struct platform_driver mt8192_pinctrl_driver = {
        .driver = {
                .name = "mt8192-pinctrl",
                .of_match_table = mt8192_pinctrl_of_match,
-               .pm = &mtk_paris_pinctrl_pm_ops,
+               .pm = pm_sleep_ptr(&mtk_paris_pinctrl_pm_ops),
        },
        .probe = mtk_paris_pinctrl_probe,
 };

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8195.c b/drivers/pinctrl/mediatek/pinctrl-mt8195.c
index 09c4dce..83345c5 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt8195.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8195.c
@@ -968,7 +968,7 @@ static struct platform_driver mt8195_pinctrl_driver = {
        .driver = {
                .name = "mt8195-pinctrl",
                .of_match_table = mt8195_pinctrl_of_match,
-               .pm = &mtk_paris_pinctrl_pm_ops,
+               .pm = pm_sleep_ptr(&mtk_paris_pinctrl_pm_ops),
        },
        .probe = mtk_paris_pinctrl_probe,
 };

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8365.c b/drivers/pinctrl/mediatek/pinctrl-mt8365.c
index 1db04bb..e3e0d66 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt8365.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8365.c
@@ -484,7 +484,7 @@ static struct platform_driver mtk_pinctrl_driver = {
        .driver = {
                .name = "mediatek-mt8365-pinctrl",
                .of_match_table = mt8365_pctrl_match,
-               .pm = &mtk_eint_pm_ops,
+               .pm = pm_sleep_ptr(&mtk_eint_pm_ops),
        },
 };
 

diff --git a/drivers/pinctrl/mediatek/pinctrl-mt8516.c b/drivers/pinctrl/mediatek/pinctrl-mt8516.c
index 950275c..abda75d 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mt8516.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mt8516.c
@@ -334,7 +334,7 @@ static struct platform_driver mtk_pinctrl_driver = {
        .driver = {
                .name = "mediatek-mt8516-pinctrl",
                .of_match_table = mt8516_pctrl_match,
-               .pm = &mtk_eint_pm_ops,
+               .pm = pm_sleep_ptr(&mtk_eint_pm_ops),
        },
 };
 

diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
index e79d66a..d39afc1 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
+++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
@@ -914,9 +914,8 @@ static int mtk_eint_resume(struct device *device)
        return mtk_eint_do_resume(pctl->eint);
 }
 
-const struct dev_pm_ops mtk_eint_pm_ops = {
-       .suspend_noirq = mtk_eint_suspend,
-       .resume_noirq = mtk_eint_resume,
+EXPORT_GPL_DEV_SLEEP_PM_OPS(mtk_eint_pm_ops) = {
+       NOIRQ_SYSTEM_SLEEP_PM_OPS(mtk_eint_suspend, mtk_eint_resume)
 };
 
 static int mtk_pctrl_build_state(struct platform_device *pdev)

diff --git a/drivers/pinctrl/mediatek/pinctrl-paris.c b/drivers/pinctrl/mediatek/pinctrl-paris.c
index 6392f1e..b6bc31a 100644 (file)
--- a/drivers/pinctrl/mediatek/pinctrl-paris.c
+++ b/drivers/pinctrl/mediatek/pinctrl-paris.c
@@ -1131,9 +1131,8 @@ static int mtk_paris_pinctrl_resume(struct device *device)
        return mtk_eint_do_resume(pctl->eint);
 }
 
-const struct dev_pm_ops mtk_paris_pinctrl_pm_ops = {
-       .suspend_noirq = mtk_paris_pinctrl_suspend,
-       .resume_noirq = mtk_paris_pinctrl_resume,
+EXPORT_GPL_DEV_SLEEP_PM_OPS(mtk_paris_pinctrl_pm_ops) = {
+       NOIRQ_SYSTEM_SLEEP_PM_OPS(mtk_paris_pinctrl_suspend, mtk_paris_pinctrl_resume)
 };
 
 MODULE_LICENSE("GPL v2");