On Mon, 17 Jul 2023 20:28:18 +0300
Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> wrote:
> Since pm.h provides a helper for system no-IRQ PM callbacks,
> switch the driver to use it instead of open coded variant.
Good to mention the renames as well.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
> ---
> drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 5 +----
> drivers/pinctrl/mediatek/pinctrl-paris.c | 9 +++------
> 2 files changed, 4 insertions(+), 10 deletions(-)
>
> diff --git a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> index 665dec419e7c..2bf5082d3aa9 100644
> --- a/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> +++ b/drivers/pinctrl/mediatek/pinctrl-mtk-common.c
> @@ -922,10 +922,7 @@ 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,
> -};
> +DEFINE_NOIRQ_DEV_PM_OPS(mtk_eint_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 33d6c3fb7908..b1cbd5bafa2e 100644
> --- a/drivers/pinctrl/mediatek/pinctrl-paris.c
> +++ b/drivers/pinctrl/mediatek/pinctrl-paris.c
> @@ -1119,24 +1119,21 @@ int mtk_paris_pinctrl_probe(struct platform_device *pdev)
> }
> EXPORT_SYMBOL_GPL(mtk_paris_pinctrl_probe);
>
> -static int mtk_paris_pinctrl_suspend(struct device *device)
> +static int mtk_paris_suspend(struct device *device)
> {
> struct mtk_pinctrl *pctl = dev_get_drvdata(device);
>
> return mtk_eint_do_suspend(pctl->eint);
> }
>
> -static int mtk_paris_pinctrl_resume(struct device *device)
> +static int mtk_paris_resume(struct device *device)
> {
> struct mtk_pinctrl *pctl = dev_get_drvdata(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,
> -};
> +DEFINE_NOIRQ_DEV_PM_OPS(mtk_paris_pinctrl_pm_ops, mtk_paris_suspend, mtk_paris_resume);
>
> MODULE_LICENSE("GPL v2");
> MODULE_DESCRIPTION("MediaTek Pinctrl Common Driver V2 Paris");
