netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] net: phy: make mdio_bus_phy_suspend/resume as __maybe_unused
@ 2021-02-25 14:57 Arnd Bergmann
  2021-02-25 22:53 ` Andrew Lunn
  0 siblings, 1 reply; 3+ messages in thread
From: Arnd Bergmann @ 2021-02-25 14:57 UTC (permalink / raw)
  To: Andrew Lunn, Heiner Kallweit, David S. Miller, Jakub Kicinski
  Cc: Arnd Bergmann, Russell King, Florian Fainelli, Ioana Ciornei,
	netdev, linux-kernel

From: Arnd Bergmann <arnd@arndb.de>

When CONFIG_PM_SLEEP is disabled, the compiler warns about unused
functions:

drivers/net/phy/phy_device.c:273:12: error: unused function 'mdio_bus_phy_suspend' [-Werror,-Wunused-function]
static int mdio_bus_phy_suspend(struct device *dev)
drivers/net/phy/phy_device.c:293:12: error: unused function 'mdio_bus_phy_resume' [-Werror,-Wunused-function]
static int mdio_bus_phy_resume(struct device *dev)

The logic is intentional, so just mark these two as __maybe_unused
and remove the incorrect #ifdef.

Fixes: 4c0d2e96ba05 ("net: phy: consider that suspend2ram may cut off PHY power")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/net/phy/phy_device.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index ce495473cd5d..cc38e326405a 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -230,7 +230,6 @@ static struct phy_driver genphy_driver;
 static LIST_HEAD(phy_fixup_list);
 static DEFINE_MUTEX(phy_fixup_lock);
 
-#ifdef CONFIG_PM
 static bool mdio_bus_phy_may_suspend(struct phy_device *phydev)
 {
 	struct device_driver *drv = phydev->mdio.dev.driver;
@@ -270,7 +269,7 @@ static bool mdio_bus_phy_may_suspend(struct phy_device *phydev)
 	return !phydev->suspended;
 }
 
-static int mdio_bus_phy_suspend(struct device *dev)
+static __maybe_unused int mdio_bus_phy_suspend(struct device *dev)
 {
 	struct phy_device *phydev = to_phy_device(dev);
 
@@ -290,7 +289,7 @@ static int mdio_bus_phy_suspend(struct device *dev)
 	return phy_suspend(phydev);
 }
 
-static int mdio_bus_phy_resume(struct device *dev)
+static __maybe_unused int mdio_bus_phy_resume(struct device *dev)
 {
 	struct phy_device *phydev = to_phy_device(dev);
 	int ret;
@@ -316,7 +315,6 @@ static int mdio_bus_phy_resume(struct device *dev)
 
 static SIMPLE_DEV_PM_OPS(mdio_bus_phy_pm_ops, mdio_bus_phy_suspend,
 			 mdio_bus_phy_resume);
-#endif /* CONFIG_PM */
 
 /**
  * phy_register_fixup - creates a new phy_fixup and adds it to the list
-- 
2.29.2


^ permalink raw reply related	[flat|nested] 3+ messages in thread
* Re: [PATCH] net: phy: make mdio_bus_phy_suspend/resume as __maybe_unused
  2021-02-25 14:57 [PATCH] net: phy: make mdio_bus_phy_suspend/resume as __maybe_unused Arnd Bergmann
@ 2021-02-25 22:53 ` Andrew Lunn
  2021-02-26 23:44   ` Jakub Kicinski
  0 siblings, 1 reply; 3+ messages in thread
From: Andrew Lunn @ 2021-02-25 22:53 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Heiner Kallweit, David S. Miller, Jakub Kicinski, Arnd Bergmann,
	Russell King, Florian Fainelli, Ioana Ciornei, netdev,
	linux-kernel

On Thu, Feb 25, 2021 at 03:57:27PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> When CONFIG_PM_SLEEP is disabled, the compiler warns about unused
> functions:
> 
> drivers/net/phy/phy_device.c:273:12: error: unused function 'mdio_bus_phy_suspend' [-Werror,-Wunused-function]
> static int mdio_bus_phy_suspend(struct device *dev)
> drivers/net/phy/phy_device.c:293:12: error: unused function 'mdio_bus_phy_resume' [-Werror,-Wunused-function]
> static int mdio_bus_phy_resume(struct device *dev)
> 
> The logic is intentional, so just mark these two as __maybe_unused
> and remove the incorrect #ifdef.
> 
> Fixes: 4c0d2e96ba05 ("net: phy: consider that suspend2ram may cut off PHY power")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>

Reviewed-by: Andrew Lunn <andrew@lunn.ch>

    Andrew

^ permalink raw reply	[flat|nested] 3+ messages in thread
* Re: [PATCH] net: phy: make mdio_bus_phy_suspend/resume as __maybe_unused
  2021-02-25 22:53 ` Andrew Lunn
@ 2021-02-26 23:44   ` Jakub Kicinski
  0 siblings, 0 replies; 3+ messages in thread
From: Jakub Kicinski @ 2021-02-26 23:44 UTC (permalink / raw)
  To: Andrew Lunn, Arnd Bergmann
  Cc: Heiner Kallweit, David S. Miller, Arnd Bergmann, Russell King,
	Florian Fainelli, Ioana Ciornei, netdev, linux-kernel

On Thu, 25 Feb 2021 23:53:20 +0100 Andrew Lunn wrote:
> On Thu, Feb 25, 2021 at 03:57:27PM +0100, Arnd Bergmann wrote:
> > From: Arnd Bergmann <arnd@arndb.de>
> > 
> > When CONFIG_PM_SLEEP is disabled, the compiler warns about unused
> > functions:
> > 
> > drivers/net/phy/phy_device.c:273:12: error: unused function 'mdio_bus_phy_suspend' [-Werror,-Wunused-function]
> > static int mdio_bus_phy_suspend(struct device *dev)
> > drivers/net/phy/phy_device.c:293:12: error: unused function 'mdio_bus_phy_resume' [-Werror,-Wunused-function]
> > static int mdio_bus_phy_resume(struct device *dev)
> > 
> > The logic is intentional, so just mark these two as __maybe_unused
> > and remove the incorrect #ifdef.
> > 
> > Fixes: 4c0d2e96ba05 ("net: phy: consider that suspend2ram may cut off PHY power")
> > Signed-off-by: Arnd Bergmann <arnd@arndb.de>  
> 
> Reviewed-by: Andrew Lunn <andrew@lunn.ch>

Applied, thanks!

^ permalink raw reply	[flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-02-26 23:45 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-02-25 14:57 [PATCH] net: phy: make mdio_bus_phy_suspend/resume as __maybe_unused Arnd Bergmann
2021-02-25 22:53 ` Andrew Lunn
2021-02-26 23:44   ` Jakub Kicinski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).