2020-07-01 09:07:13

by Tobias Klauser

[permalink] [raw]
Subject: [PATCH] phy: zynqmp: Fix unused-function compiler warning

This fixes the following compiler warning when building with
CONFIG_PM && !CONFIG_PM_SLEEP:

drivers/phy/xilinx/phy-zynqmp.c:830:12: warning: ‘xpsgtr_resume’ defined but not used [-Wunused-function]
830 | static int xpsgtr_resume(struct device *dev)
| ^~~~~~~~~~~~~
drivers/phy/xilinx/phy-zynqmp.c:819:12: warning: ‘xpsgtr_suspend’ defined but not used [-Wunused-function]
819 | static int xpsgtr_suspend(struct device *dev)
| ^~~~~~~~~~~~~~

Signed-off-by: Tobias Klauser <[email protected]>
---
drivers/phy/xilinx/phy-zynqmp.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/phy/xilinx/phy-zynqmp.c b/drivers/phy/xilinx/phy-zynqmp.c
index 8babee2ce9ec..22a0ae635797 100644
--- a/drivers/phy/xilinx/phy-zynqmp.c
+++ b/drivers/phy/xilinx/phy-zynqmp.c
@@ -815,7 +815,7 @@ static struct phy *xpsgtr_xlate(struct device *dev,
* Power Management
*/

-#ifdef CONFIG_PM
+#ifdef CONFIG_PM_SLEEP
static int xpsgtr_suspend(struct device *dev)
{
struct xpsgtr_dev *gtr_dev = dev_get_drvdata(dev);
@@ -854,7 +854,7 @@ static int xpsgtr_resume(struct device *dev)

return 0;
}
-#endif /* CONFIG_PM */
+#endif /* CONFIG_PM_SLEEP */

static const struct dev_pm_ops xpsgtr_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(xpsgtr_suspend, xpsgtr_resume)
--
2.27.0


2020-07-01 13:22:02

by Laurent Pinchart

[permalink] [raw]
Subject: Re: [PATCH] phy: zynqmp: Fix unused-function compiler warning

Hi Tobias,

Thank you for the patch.

On Wed, Jul 01, 2020 at 11:04:38AM +0200, Tobias Klauser wrote:
> This fixes the following compiler warning when building with
> CONFIG_PM && !CONFIG_PM_SLEEP:
>
> drivers/phy/xilinx/phy-zynqmp.c:830:12: warning: ‘xpsgtr_resume’ defined but not used [-Wunused-function]
> 830 | static int xpsgtr_resume(struct device *dev)
> | ^~~~~~~~~~~~~
> drivers/phy/xilinx/phy-zynqmp.c:819:12: warning: ‘xpsgtr_suspend’ defined but not used [-Wunused-function]
> 819 | static int xpsgtr_suspend(struct device *dev)
> | ^~~~~~~~~~~~~~

Oops :-S Sorry about that.

Reviewed-by: Laurent Pinchart <[email protected]>

Vinod or Kishon, can you pick this patch up, or do I need to send a pull
request ? (It's my first driver in the PHY subsystem so I don't know
what the usual practices are there)

> Signed-off-by: Tobias Klauser <[email protected]>
> ---
> drivers/phy/xilinx/phy-zynqmp.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/phy/xilinx/phy-zynqmp.c b/drivers/phy/xilinx/phy-zynqmp.c
> index 8babee2ce9ec..22a0ae635797 100644
> --- a/drivers/phy/xilinx/phy-zynqmp.c
> +++ b/drivers/phy/xilinx/phy-zynqmp.c
> @@ -815,7 +815,7 @@ static struct phy *xpsgtr_xlate(struct device *dev,
> * Power Management
> */
>
> -#ifdef CONFIG_PM
> +#ifdef CONFIG_PM_SLEEP
> static int xpsgtr_suspend(struct device *dev)
> {
> struct xpsgtr_dev *gtr_dev = dev_get_drvdata(dev);
> @@ -854,7 +854,7 @@ static int xpsgtr_resume(struct device *dev)
>
> return 0;
> }
> -#endif /* CONFIG_PM */
> +#endif /* CONFIG_PM_SLEEP */
>
> static const struct dev_pm_ops xpsgtr_pm_ops = {
> SET_SYSTEM_SLEEP_PM_OPS(xpsgtr_suspend, xpsgtr_resume)

--
Regards,

Laurent Pinchart

2020-07-01 13:37:22

by Vinod Koul

[permalink] [raw]
Subject: Re: [PATCH] phy: zynqmp: Fix unused-function compiler warning

On 01-07-20, 16:19, Laurent Pinchart wrote:
> Hi Tobias,
>
> Thank you for the patch.
>
> On Wed, Jul 01, 2020 at 11:04:38AM +0200, Tobias Klauser wrote:
> > This fixes the following compiler warning when building with
> > CONFIG_PM && !CONFIG_PM_SLEEP:
> >
> > drivers/phy/xilinx/phy-zynqmp.c:830:12: warning: ‘xpsgtr_resume’ defined but not used [-Wunused-function]
> > 830 | static int xpsgtr_resume(struct device *dev)
> > | ^~~~~~~~~~~~~
> > drivers/phy/xilinx/phy-zynqmp.c:819:12: warning: ‘xpsgtr_suspend’ defined but not used [-Wunused-function]
> > 819 | static int xpsgtr_suspend(struct device *dev)
> > | ^~~~~~~~~~~~~~
>
> Oops :-S Sorry about that.
>
> Reviewed-by: Laurent Pinchart <[email protected]>
>
> Vinod or Kishon, can you pick this patch up, or do I need to send a pull
> request ? (It's my first driver in the PHY subsystem so I don't know
> what the usual practices are there)

patches are welcome :-)

>
> > Signed-off-by: Tobias Klauser <[email protected]>
> > ---
> > drivers/phy/xilinx/phy-zynqmp.c | 4 ++--
> > 1 file changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/phy/xilinx/phy-zynqmp.c b/drivers/phy/xilinx/phy-zynqmp.c
> > index 8babee2ce9ec..22a0ae635797 100644
> > --- a/drivers/phy/xilinx/phy-zynqmp.c
> > +++ b/drivers/phy/xilinx/phy-zynqmp.c
> > @@ -815,7 +815,7 @@ static struct phy *xpsgtr_xlate(struct device *dev,
> > * Power Management
> > */
> >
> > -#ifdef CONFIG_PM
> > +#ifdef CONFIG_PM_SLEEP

How about marking it as __maybe_unused instead?

--
~Vinod

2020-07-01 13:45:24

by Laurent Pinchart

[permalink] [raw]
Subject: Re: [PATCH] phy: zynqmp: Fix unused-function compiler warning

Hi Vinod,

On Wed, Jul 01, 2020 at 07:06:43PM +0530, Vinod Koul wrote:
> On 01-07-20, 16:19, Laurent Pinchart wrote:
> > On Wed, Jul 01, 2020 at 11:04:38AM +0200, Tobias Klauser wrote:
> > > This fixes the following compiler warning when building with
> > > CONFIG_PM && !CONFIG_PM_SLEEP:
> > >
> > > drivers/phy/xilinx/phy-zynqmp.c:830:12: warning: ‘xpsgtr_resume’ defined but not used [-Wunused-function]
> > > 830 | static int xpsgtr_resume(struct device *dev)
> > > | ^~~~~~~~~~~~~
> > > drivers/phy/xilinx/phy-zynqmp.c:819:12: warning: ‘xpsgtr_suspend’ defined but not used [-Wunused-function]
> > > 819 | static int xpsgtr_suspend(struct device *dev)
> > > | ^~~~~~~~~~~~~~
> >
> > Oops :-S Sorry about that.
> >
> > Reviewed-by: Laurent Pinchart <[email protected]>
> >
> > Vinod or Kishon, can you pick this patch up, or do I need to send a pull
> > request ? (It's my first driver in the PHY subsystem so I don't know
> > what the usual practices are there)
>
> patches are welcome :-)
>
> >
> > > Signed-off-by: Tobias Klauser <[email protected]>
> > > ---
> > > drivers/phy/xilinx/phy-zynqmp.c | 4 ++--
> > > 1 file changed, 2 insertions(+), 2 deletions(-)
> > >
> > > diff --git a/drivers/phy/xilinx/phy-zynqmp.c b/drivers/phy/xilinx/phy-zynqmp.c
> > > index 8babee2ce9ec..22a0ae635797 100644
> > > --- a/drivers/phy/xilinx/phy-zynqmp.c
> > > +++ b/drivers/phy/xilinx/phy-zynqmp.c
> > > @@ -815,7 +815,7 @@ static struct phy *xpsgtr_xlate(struct device *dev,
> > > * Power Management
> > > */
> > >
> > > -#ifdef CONFIG_PM
> > > +#ifdef CONFIG_PM_SLEEP
>
> How about marking it as __maybe_unused instead?

I don't mind either, I'll let Tobias decide, but his patch seems fine,
is there a drawback in his approach ? If it's just a matter of personal
preference, I'd rather not require a v2.

--
Regards,

Laurent Pinchart

2020-07-01 13:57:01

by Vinod Koul

[permalink] [raw]
Subject: Re: [PATCH] phy: zynqmp: Fix unused-function compiler warning

Hi Laurent,

On 01-07-20, 16:44, Laurent Pinchart wrote:

> > How about marking it as __maybe_unused instead?
>
> I don't mind either, I'll let Tobias decide, but his patch seems fine,
> is there a drawback in his approach ? If it's just a matter of personal
> preference, I'd rather not require a v2.

__maybe_unused is the preferred way to do as Documented in
Documentation/process/coding-style.rst and makes code look neater..

Thanks
--
~Vinod

2020-07-01 14:01:03

by Tobias Klauser

[permalink] [raw]
Subject: Re: [PATCH] phy: zynqmp: Fix unused-function compiler warning

On 2020-07-01 at 15:44:43 +0200, Laurent Pinchart <[email protected]> wrote:
> On Wed, Jul 01, 2020 at 07:06:43PM +0530, Vinod Koul wrote:
> > On 01-07-20, 16:19, Laurent Pinchart wrote:
> > > On Wed, Jul 01, 2020 at 11:04:38AM +0200, Tobias Klauser wrote:
> > > > This fixes the following compiler warning when building with
> > > > CONFIG_PM && !CONFIG_PM_SLEEP:
> > > >
> > > > drivers/phy/xilinx/phy-zynqmp.c:830:12: warning: ‘xpsgtr_resume’ defined but not used [-Wunused-function]
> > > > 830 | static int xpsgtr_resume(struct device *dev)
> > > > | ^~~~~~~~~~~~~
> > > > drivers/phy/xilinx/phy-zynqmp.c:819:12: warning: ‘xpsgtr_suspend’ defined but not used [-Wunused-function]
> > > > 819 | static int xpsgtr_suspend(struct device *dev)
> > > > | ^~~~~~~~~~~~~~
> > >
> > > Oops :-S Sorry about that.
> > >
> > > Reviewed-by: Laurent Pinchart <[email protected]>

Thanks for the review Laurent.

> > > Vinod or Kishon, can you pick this patch up, or do I need to send a pull
> > > request ? (It's my first driver in the PHY subsystem so I don't know
> > > what the usual practices are there)
> >
> > patches are welcome :-)
> >
> > >
> > > > Signed-off-by: Tobias Klauser <[email protected]>
> > > > ---
> > > > drivers/phy/xilinx/phy-zynqmp.c | 4 ++--
> > > > 1 file changed, 2 insertions(+), 2 deletions(-)
> > > >
> > > > diff --git a/drivers/phy/xilinx/phy-zynqmp.c b/drivers/phy/xilinx/phy-zynqmp.c
> > > > index 8babee2ce9ec..22a0ae635797 100644
> > > > --- a/drivers/phy/xilinx/phy-zynqmp.c
> > > > +++ b/drivers/phy/xilinx/phy-zynqmp.c
> > > > @@ -815,7 +815,7 @@ static struct phy *xpsgtr_xlate(struct device *dev,
> > > > * Power Management
> > > > */
> > > >
> > > > -#ifdef CONFIG_PM
> > > > +#ifdef CONFIG_PM_SLEEP
> >
> > How about marking it as __maybe_unused instead?
>
> I don't mind either, I'll let Tobias decide, but his patch seems fine,
> is there a drawback in his approach ? If it's just a matter of personal
> preference, I'd rather not require a v2.

I don't mind either, it was just what seemed the more straight-forward
fix. On the other hand, it seems that marking these functions as
__maybe_unused is the more widely used method in other PHY drivers. In
addition it would have the nice side-effect of the code always being
compile-checked regardless of the value of CONFIG_PM_SLEEP.

Will send a v2 using __maybe_unused and will let you decide which one to
pick :)

Thanks

2020-07-01 14:01:53

by Laurent Pinchart

[permalink] [raw]
Subject: Re: [PATCH] phy: zynqmp: Fix unused-function compiler warning

On Wed, Jul 01, 2020 at 04:00:26PM +0200, Tobias Klauser wrote:
> On 2020-07-01 at 15:44:43 +0200, Laurent Pinchart <[email protected]> wrote:
> > On Wed, Jul 01, 2020 at 07:06:43PM +0530, Vinod Koul wrote:
> > > On 01-07-20, 16:19, Laurent Pinchart wrote:
> > > > On Wed, Jul 01, 2020 at 11:04:38AM +0200, Tobias Klauser wrote:
> > > > > This fixes the following compiler warning when building with
> > > > > CONFIG_PM && !CONFIG_PM_SLEEP:
> > > > >
> > > > > drivers/phy/xilinx/phy-zynqmp.c:830:12: warning: ‘xpsgtr_resume’ defined but not used [-Wunused-function]
> > > > > 830 | static int xpsgtr_resume(struct device *dev)
> > > > > | ^~~~~~~~~~~~~
> > > > > drivers/phy/xilinx/phy-zynqmp.c:819:12: warning: ‘xpsgtr_suspend’ defined but not used [-Wunused-function]
> > > > > 819 | static int xpsgtr_suspend(struct device *dev)
> > > > > | ^~~~~~~~~~~~~~
> > > >
> > > > Oops :-S Sorry about that.
> > > >
> > > > Reviewed-by: Laurent Pinchart <[email protected]>
>
> Thanks for the review Laurent.
>
> > > > Vinod or Kishon, can you pick this patch up, or do I need to send a pull
> > > > request ? (It's my first driver in the PHY subsystem so I don't know
> > > > what the usual practices are there)
> > >
> > > patches are welcome :-)
> > >
> > > >
> > > > > Signed-off-by: Tobias Klauser <[email protected]>
> > > > > ---
> > > > > drivers/phy/xilinx/phy-zynqmp.c | 4 ++--
> > > > > 1 file changed, 2 insertions(+), 2 deletions(-)
> > > > >
> > > > > diff --git a/drivers/phy/xilinx/phy-zynqmp.c b/drivers/phy/xilinx/phy-zynqmp.c
> > > > > index 8babee2ce9ec..22a0ae635797 100644
> > > > > --- a/drivers/phy/xilinx/phy-zynqmp.c
> > > > > +++ b/drivers/phy/xilinx/phy-zynqmp.c
> > > > > @@ -815,7 +815,7 @@ static struct phy *xpsgtr_xlate(struct device *dev,
> > > > > * Power Management
> > > > > */
> > > > >
> > > > > -#ifdef CONFIG_PM
> > > > > +#ifdef CONFIG_PM_SLEEP
> > >
> > > How about marking it as __maybe_unused instead?
> >
> > I don't mind either, I'll let Tobias decide, but his patch seems fine,
> > is there a drawback in his approach ? If it's just a matter of personal
> > preference, I'd rather not require a v2.
>
> I don't mind either, it was just what seemed the more straight-forward
> fix. On the other hand, it seems that marking these functions as
> __maybe_unused is the more widely used method in other PHY drivers. In
> addition it would have the nice side-effect of the code always being
> compile-checked regardless of the value of CONFIG_PM_SLEEP.

That's a good point, haven't thought about it.

> Will send a v2 using __maybe_unused and will let you decide which one to
> pick :)

You can keep my R-b :-)

--
Regards,

Laurent Pinchart

2020-07-01 14:08:15

by Tobias Klauser

[permalink] [raw]
Subject: Re: [PATCH] phy: zynqmp: Fix unused-function compiler warning

On 2020-07-01 at 16:01:08 +0200, Laurent Pinchart <[email protected]> wrote:
> On Wed, Jul 01, 2020 at 04:00:26PM +0200, Tobias Klauser wrote:
> > On 2020-07-01 at 15:44:43 +0200, Laurent Pinchart <[email protected]> wrote:
> > > On Wed, Jul 01, 2020 at 07:06:43PM +0530, Vinod Koul wrote:
> > > > On 01-07-20, 16:19, Laurent Pinchart wrote:
> > > > > On Wed, Jul 01, 2020 at 11:04:38AM +0200, Tobias Klauser wrote:
> > > > > > This fixes the following compiler warning when building with
> > > > > > CONFIG_PM && !CONFIG_PM_SLEEP:
> > > > > >
> > > > > > drivers/phy/xilinx/phy-zynqmp.c:830:12: warning: ‘xpsgtr_resume’ defined but not used [-Wunused-function]
> > > > > > 830 | static int xpsgtr_resume(struct device *dev)
> > > > > > | ^~~~~~~~~~~~~
> > > > > > drivers/phy/xilinx/phy-zynqmp.c:819:12: warning: ‘xpsgtr_suspend’ defined but not used [-Wunused-function]
> > > > > > 819 | static int xpsgtr_suspend(struct device *dev)
> > > > > > | ^~~~~~~~~~~~~~
> > > > >
> > > > > Oops :-S Sorry about that.
> > > > >
> > > > > Reviewed-by: Laurent Pinchart <[email protected]>
> >
> > Thanks for the review Laurent.
> >
> > > > > Vinod or Kishon, can you pick this patch up, or do I need to send a pull
> > > > > request ? (It's my first driver in the PHY subsystem so I don't know
> > > > > what the usual practices are there)
> > > >
> > > > patches are welcome :-)
> > > >
> > > > >
> > > > > > Signed-off-by: Tobias Klauser <[email protected]>
> > > > > > ---
> > > > > > drivers/phy/xilinx/phy-zynqmp.c | 4 ++--
> > > > > > 1 file changed, 2 insertions(+), 2 deletions(-)
> > > > > >
> > > > > > diff --git a/drivers/phy/xilinx/phy-zynqmp.c b/drivers/phy/xilinx/phy-zynqmp.c
> > > > > > index 8babee2ce9ec..22a0ae635797 100644
> > > > > > --- a/drivers/phy/xilinx/phy-zynqmp.c
> > > > > > +++ b/drivers/phy/xilinx/phy-zynqmp.c
> > > > > > @@ -815,7 +815,7 @@ static struct phy *xpsgtr_xlate(struct device *dev,
> > > > > > * Power Management
> > > > > > */
> > > > > >
> > > > > > -#ifdef CONFIG_PM
> > > > > > +#ifdef CONFIG_PM_SLEEP
> > > >
> > > > How about marking it as __maybe_unused instead?
> > >
> > > I don't mind either, I'll let Tobias decide, but his patch seems fine,
> > > is there a drawback in his approach ? If it's just a matter of personal
> > > preference, I'd rather not require a v2.
> >
> > I don't mind either, it was just what seemed the more straight-forward
> > fix. On the other hand, it seems that marking these functions as
> > __maybe_unused is the more widely used method in other PHY drivers. In
> > addition it would have the nice side-effect of the code always being
> > compile-checked regardless of the value of CONFIG_PM_SLEEP.
>
> That's a good point, haven't thought about it.
>
> > Will send a v2 using __maybe_unused and will let you decide which one to
> > pick :)
>
> You can keep my R-b :-)

Thanks :) FWIW, I'd also drop the #ifdef CONFIG_PM in the same patch for
the same reason. Is that OK with you as well?

2020-07-01 14:10:13

by Laurent Pinchart

[permalink] [raw]
Subject: Re: [PATCH] phy: zynqmp: Fix unused-function compiler warning

Hi Tobias,

On Wed, Jul 01, 2020 at 04:07:09PM +0200, Tobias Klauser wrote:
> On 2020-07-01 at 16:01:08 +0200, Laurent Pinchart <[email protected]> wrote:
> > On Wed, Jul 01, 2020 at 04:00:26PM +0200, Tobias Klauser wrote:
> >> On 2020-07-01 at 15:44:43 +0200, Laurent Pinchart <[email protected]> wrote:
> >>> On Wed, Jul 01, 2020 at 07:06:43PM +0530, Vinod Koul wrote:
> >>>> On 01-07-20, 16:19, Laurent Pinchart wrote:
> >>>>> On Wed, Jul 01, 2020 at 11:04:38AM +0200, Tobias Klauser wrote:
> >>>>>> This fixes the following compiler warning when building with
> >>>>>> CONFIG_PM && !CONFIG_PM_SLEEP:
> >>>>>>
> >>>>>> drivers/phy/xilinx/phy-zynqmp.c:830:12: warning: ‘xpsgtr_resume’ defined but not used [-Wunused-function]
> >>>>>> 830 | static int xpsgtr_resume(struct device *dev)
> >>>>>> | ^~~~~~~~~~~~~
> >>>>>> drivers/phy/xilinx/phy-zynqmp.c:819:12: warning: ‘xpsgtr_suspend’ defined but not used [-Wunused-function]
> >>>>>> 819 | static int xpsgtr_suspend(struct device *dev)
> >>>>>> | ^~~~~~~~~~~~~~
> >>>>>
> >>>>> Oops :-S Sorry about that.
> >>>>>
> >>>>> Reviewed-by: Laurent Pinchart <[email protected]>
> >>
> >> Thanks for the review Laurent.
> >>
> >>>>> Vinod or Kishon, can you pick this patch up, or do I need to send a pull
> >>>>> request ? (It's my first driver in the PHY subsystem so I don't know
> >>>>> what the usual practices are there)
> >>>>
> >>>> patches are welcome :-)
> >>>>
> >>>>>
> >>>>>> Signed-off-by: Tobias Klauser <[email protected]>
> >>>>>> ---
> >>>>>> drivers/phy/xilinx/phy-zynqmp.c | 4 ++--
> >>>>>> 1 file changed, 2 insertions(+), 2 deletions(-)
> >>>>>>
> >>>>>> diff --git a/drivers/phy/xilinx/phy-zynqmp.c b/drivers/phy/xilinx/phy-zynqmp.c
> >>>>>> index 8babee2ce9ec..22a0ae635797 100644
> >>>>>> --- a/drivers/phy/xilinx/phy-zynqmp.c
> >>>>>> +++ b/drivers/phy/xilinx/phy-zynqmp.c
> >>>>>> @@ -815,7 +815,7 @@ static struct phy *xpsgtr_xlate(struct device *dev,
> >>>>>> * Power Management
> >>>>>> */
> >>>>>>
> >>>>>> -#ifdef CONFIG_PM
> >>>>>> +#ifdef CONFIG_PM_SLEEP
> >>>>
> >>>> How about marking it as __maybe_unused instead?
> >>>
> >>> I don't mind either, I'll let Tobias decide, but his patch seems fine,
> >>> is there a drawback in his approach ? If it's just a matter of personal
> >>> preference, I'd rather not require a v2.
> >>
> >> I don't mind either, it was just what seemed the more straight-forward
> >> fix. On the other hand, it seems that marking these functions as
> >> __maybe_unused is the more widely used method in other PHY drivers. In
> >> addition it would have the nice side-effect of the code always being
> >> compile-checked regardless of the value of CONFIG_PM_SLEEP.
> >
> > That's a good point, haven't thought about it.
> >
> >> Will send a v2 using __maybe_unused and will let you decide which one to
> >> pick :)
> >
> > You can keep my R-b :-)
>
> Thanks :) FWIW, I'd also drop the #ifdef CONFIG_PM in the same patch for
> the same reason. Is that OK with you as well?

Sure.

--
Regards,

Laurent Pinchart

2020-07-01 14:13:27

by Tobias Klauser

[permalink] [raw]
Subject: [PATCH v2] phy: zynqmp: Fix unused-function compiler warning

Mark xpsgtr_suspend and xpsgtr_resume as __maybe_unused to fix the
following compiler warning when building with !CONFIG_PM_SLEEP:

drivers/phy/xilinx/phy-zynqmp.c:830:12: warning: ‘xpsgtr_resume’ defined but not used [-Wunused-function]
830 | static int xpsgtr_resume(struct device *dev)
| ^~~~~~~~~~~~~
drivers/phy/xilinx/phy-zynqmp.c:819:12: warning: ‘xpsgtr_suspend’ defined but not used [-Wunused-function]
819 | static int xpsgtr_suspend(struct device *dev)
| ^~~~~~~~~~~~~~

Also drop the existing #ifdef CONFIG_PM so the functions are always
compile-checked regardless of CONFIG_PM and/or CONFIG_PM_SLEEP being
set.

Reviewed-by: Laurent Pinchart <[email protected]>
Signed-off-by: Tobias Klauser <[email protected]>
---
drivers/phy/xilinx/phy-zynqmp.c | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/phy/xilinx/phy-zynqmp.c b/drivers/phy/xilinx/phy-zynqmp.c
index 8babee2ce9ec..2b0f921b6ee3 100644
--- a/drivers/phy/xilinx/phy-zynqmp.c
+++ b/drivers/phy/xilinx/phy-zynqmp.c
@@ -815,8 +815,7 @@ static struct phy *xpsgtr_xlate(struct device *dev,
* Power Management
*/

-#ifdef CONFIG_PM
-static int xpsgtr_suspend(struct device *dev)
+static int __maybe_unused xpsgtr_suspend(struct device *dev)
{
struct xpsgtr_dev *gtr_dev = dev_get_drvdata(dev);

@@ -827,7 +826,7 @@ static int xpsgtr_suspend(struct device *dev)
return 0;
}

-static int xpsgtr_resume(struct device *dev)
+static int __maybe_unused xpsgtr_resume(struct device *dev)
{
struct xpsgtr_dev *gtr_dev = dev_get_drvdata(dev);
unsigned int icm_cfg0, icm_cfg1;
@@ -854,7 +853,6 @@ static int xpsgtr_resume(struct device *dev)

return 0;
}
-#endif /* CONFIG_PM */

static const struct dev_pm_ops xpsgtr_pm_ops = {
SET_SYSTEM_SLEEP_PM_OPS(xpsgtr_suspend, xpsgtr_resume)
--
2.27.0

2020-07-01 15:06:26

by Vinod Koul

[permalink] [raw]
Subject: Re: [PATCH v2] phy: zynqmp: Fix unused-function compiler warning

On 01-07-20, 16:10, Tobias Klauser wrote:
> Mark xpsgtr_suspend and xpsgtr_resume as __maybe_unused to fix the
> following compiler warning when building with !CONFIG_PM_SLEEP:
>
> drivers/phy/xilinx/phy-zynqmp.c:830:12: warning: ‘xpsgtr_resume’ defined but not used [-Wunused-function]
> 830 | static int xpsgtr_resume(struct device *dev)
> | ^~~~~~~~~~~~~
> drivers/phy/xilinx/phy-zynqmp.c:819:12: warning: ‘xpsgtr_suspend’ defined but not used [-Wunused-function]
> 819 | static int xpsgtr_suspend(struct device *dev)
> | ^~~~~~~~~~~~~~
>
> Also drop the existing #ifdef CONFIG_PM so the functions are always
> compile-checked regardless of CONFIG_PM and/or CONFIG_PM_SLEEP being
> set.

Applied, thanks

--
~Vinod