Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230711072053.2837327-1-geert+renesas@glider.be>
 <CAMRc=Mef-J-WinQxphm+CU8u-PoBan1hPT2yLih4i-RFUDePBQ@mail.gmail.com>
 <CAMRc=MfsbngW4dor9UXX1ncyabZ=NjUFZFTarcfgOO3iMz4zgw@mail.gmail.com> <CAMuHMdUratvH_C=EXaMxY+SDpvdRbLGPhe4qN7h_TtvHc_zWSg@mail.gmail.com>
In-Reply-To: <CAMuHMdUratvH_C=EXaMxY+SDpvdRbLGPhe4qN7h_TtvHc_zWSg@mail.gmail.com>
From:   Bartosz Golaszewski <brgl@bgdev.pl>
Date:   Tue, 25 Jul 2023 11:58:01 +0200
Message-ID: <CAMRc=Mcqk+DSGS6co8oLD1K+_BFaUwirCgy0j0oTPDH3R_MKCw@mail.gmail.com>
Subject: Re: [PATCH] gpio: mxc: Improve PM configuration
To:     Geert Uytterhoeven <geert@linux-m68k.org>
Cc:     Linus Walleij <linus.walleij@linaro.org>,
        Andy Shevchenko <andy@kernel.org>,
        Shenwei Wang <shenwei.wang@nxp.com>,
        linux-gpio@vger.kernel.org, linux-kernel@vger.kernel.org,
        Arnd Bergmann <arnd@arndb.de>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Mon, Jul 24, 2023 at 6:50=E2=80=AFPM Geert Uytterhoeven <geert@linux-m68=
k.org> wrote:
>
> Hi Bartosz,
>
> On Thu, Jul 20, 2023 at 5:23=E2=80=AFPM Bartosz Golaszewski <brgl@bgdev.p=
l> wrote:
> > On Thu, Jul 20, 2023 at 5:17=E2=80=AFPM Bartosz Golaszewski <brgl@bgdev=
.pl> wrote:
> > > On Tue, Jul 11, 2023 at 9:20=E2=80=AFAM Geert Uytterhoeven
> > > <geert+renesas@glider.be> wrote:
> > > > If CONFIG_PM=3Dn (e.g. m68k/allmodconfig):
> > > >
> > > >     drivers/gpio/gpio-mxc.c:612:12: error: =E2=80=98mxc_gpio_runtim=
e_resume=E2=80=99 defined but not used [-Werror=3Dunused-function]
> > > >       612 | static int mxc_gpio_runtime_resume(struct device *dev)
> > > >           |            ^~~~~~~~~~~~~~~~~~~~~~~
> > > >     drivers/gpio/gpio-mxc.c:602:12: error: =E2=80=98mxc_gpio_runtim=
e_suspend=E2=80=99 defined but not used [-Werror=3Dunused-function]
> > > >       602 | static int mxc_gpio_runtime_suspend(struct device *dev)
> > > >           |            ^~~~~~~~~~~~~~~~~~~~~~~~
> > > >
> > > > Fix this by using the non-SET *_PM_OPS to configure the dev_pm_ops
> > > > callbacks, and by wrapping the driver.pm initializer insider pm_ptr=
().
> > > >
> > > > As NOIRQ_SYSTEM_SLEEP_PM_OPS() uses pm_sleep_ptr() internally, the
> > > > __maybe_unused annotations for the noirq callbacks are no longer ne=
eded,
> > > > and can be removed.
> > > >
> > > > Fixes: 3283d820dce649ad ("gpio: mxc: add runtime pm support")
> > > > Reported-by: noreply@ellerman.id.au
> > > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
> > > > ---
> > > >  drivers/gpio/gpio-mxc.c | 10 +++++-----
> > > >  1 file changed, 5 insertions(+), 5 deletions(-)
> > > >
> > > > diff --git a/drivers/gpio/gpio-mxc.c b/drivers/gpio/gpio-mxc.c
> > > > index a9fb6bd9aa6f9645..a43df5d5006e62d3 100644
> > > > --- a/drivers/gpio/gpio-mxc.c
> > > > +++ b/drivers/gpio/gpio-mxc.c
> > > > @@ -623,7 +623,7 @@ static int mxc_gpio_runtime_resume(struct devic=
e *dev)
> > > >         return 0;
> > > >  }
> > > >
> > > > -static int __maybe_unused mxc_gpio_noirq_suspend(struct device *de=
v)
> > > > +static int mxc_gpio_noirq_suspend(struct device *dev)
> > > >  {
> > > >         struct platform_device *pdev =3D to_platform_device(dev);
> > > >         struct mxc_gpio_port *port =3D platform_get_drvdata(pdev);
> > > > @@ -634,7 +634,7 @@ static int __maybe_unused mxc_gpio_noirq_suspen=
d(struct device *dev)
> > > >         return 0;
> > > >  }
> > > >
> > > > -static int __maybe_unused mxc_gpio_noirq_resume(struct device *dev=
)
> > > > +static int mxc_gpio_noirq_resume(struct device *dev)
> > > >  {
> > > >         struct platform_device *pdev =3D to_platform_device(dev);
> > > >         struct mxc_gpio_port *port =3D platform_get_drvdata(pdev);
> > > > @@ -647,8 +647,8 @@ static int __maybe_unused mxc_gpio_noirq_resume=
(struct device *dev)
> > > >  }
> > > >
> > > >  static const struct dev_pm_ops mxc_gpio_dev_pm_ops =3D {
> > > > -       SET_NOIRQ_SYSTEM_SLEEP_PM_OPS(mxc_gpio_noirq_suspend, mxc_g=
pio_noirq_resume)
> > > > -       SET_RUNTIME_PM_OPS(mxc_gpio_runtime_suspend, mxc_gpio_runti=
me_resume, NULL)
> > > > +       NOIRQ_SYSTEM_SLEEP_PM_OPS(mxc_gpio_noirq_suspend, mxc_gpio_=
noirq_resume)
> > > > +       RUNTIME_PM_OPS(mxc_gpio_runtime_suspend, mxc_gpio_runtime_r=
esume, NULL)
> > > >  };
> > > >
> > > >  static int mxc_gpio_syscore_suspend(void)
> > > > @@ -695,7 +695,7 @@ static struct platform_driver mxc_gpio_driver =
=3D {
> > > >                 .name   =3D "gpio-mxc",
> > > >                 .of_match_table =3D mxc_gpio_dt_ids,
> > > >                 .suppress_bind_attrs =3D true,
> > > > -               .pm =3D &mxc_gpio_dev_pm_ops,
> > > > +               .pm =3D pm_ptr(&mxc_gpio_dev_pm_ops),
> > > >         },
> > > >         .probe          =3D mxc_gpio_probe,
> > > >  };
> > > > --
> > > > 2.34.1
> > > >
> > >
> > > Applied, thanks!
> > >
> > > Bart
> >
> > Nevermind, Arnd has a better fix for that so I'll apply his change.
>
> I disagree. And my patch was first ;-)
>
> Arnd's version lacks the pm_ptr() around the mxc_gpio_driver.driver.pm
> initializer, so the compiler cannot throw out the (rather large) unused
> mxc_gpio_dev_pm_ops structure.
>
> Thanks!
>

Fair enough, I replaced Arnd's patch with yours.

Thanks,
Bartosz