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 5fb377c1668bb74c3b242e9e8e450fcd8a93613a..6b1c7122b0fb996cd9c03281123c9a28b35253ed 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 8a6daa0db54b0af4b9ad25b1d53afa64852d87ac..bb7394ae252b489988f1161269c09648165537e1 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 01e855ccd4dd9d61b062ae8b520fe6e05ddf52d8..ee3ae3d2fa7e878db169344a9c17fd3f16133855 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 ba7f30c3296fecf60d26978e15fe112f7e36a9ab..143c2662227252519a14954fb9e801eacb31eb07 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 455eec018f93e6b5058bb20b59ed283f5da3320b..b214deeafbf1d6d160e90532cc2ccef8cfd411e9 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 ddc48b725c22d99a03f3ddd2d3af2e446491ae1d..93e482c6b5fda99bd78c1aa9d367a00f39321af0 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 a02f7c3269707ee9adf3b0dc75706f97289892b6..7be591591cce54d04efde09957537cf91c33506c 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 c067e043e6192d1d15264b4887246a639401b3b1..3975e99d9cf4034c430a00aeb08ff29baa24a9ee 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 dee1b3aefd36ec96d25b32504f4696534d468fa3..e3a76381f7f4eeef03b2c808ada00f9761f5f322 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 09c4dcef933838038969cc3f7a65008c6c87fa12..83345c52b2fa2cde1797da63120ceb8cba557b59 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 1db04bbdb42369a5ceb2241dd0ce512482b7e1b7..e3e0d66cfbbfcbd182adc4c57003cc1096c5422d 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 950275c47122bb917cd0d828ac264e889691ead8..abda75d4354e282279135d937576c2a15794fa78 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 e79d66a0419401ee7097d7ea9694b6fe4df16bb5..d39afc122516f12b9965208bcdf11c42565d7205 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 6392f1e05d028b56697e08b163c17a3dbbe92da7..b6bc31abd2b068695dcfd5025c0f31ea0b3c679e 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");