Netdev Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] net: phy: at803x: fix at803x_match_phy_id mismatch
@ 2021-07-21 15:01 Arnd Bergmann
  2021-07-21 15:02 ` Arnd Bergmann
  2021-07-21 15:03 ` Russell King (Oracle)
  0 siblings, 2 replies; 3+ messages in thread
From: Arnd Bergmann @ 2021-07-21 15:01 UTC (permalink / raw)
  To: Andrew Lunn, Heiner Kallweit
  Cc: Arnd Bergmann, Russell King, David S. Miller, Jakub Kicinski,
	David Bauer, Michael Walle, Ioana Ciornei, Ansuel Smith,
	Fabio Estevam, netdev, linux-kernel

From: Arnd Bergmann <arnd@arndb.de>

There are two conflicting patches in net-next, one removed
the at803x_get_features() function and the other added another
user:

drivers/net/phy/at803x.c: In function 'at803x_get_features':
drivers/net/phy/at803x.c:706:14: error: implicit declaration of function 'at803x_match_phy_id' [-Werror=implicit-function-declaration]

Change the new caller over to an open-coded comparison as well.

Fixes: 8887ca5474bd ("net: phy: at803x: simplify custom phy id matching")
Fixes: b856150c8098 ("net: phy: at803x: mask 1000 Base-X link mode")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 drivers/net/phy/at803x.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
index 0790ffcd3db6..bdac087058b2 100644
--- a/drivers/net/phy/at803x.c
+++ b/drivers/net/phy/at803x.c
@@ -703,7 +703,7 @@ static int at803x_get_features(struct phy_device *phydev)
 	if (err)
 		return err;
 
-	if (!at803x_match_phy_id(phydev, ATH8031_PHY_ID))
+	if (phydev->drv->phy_id != ATH8031_PHY_ID)
 		return 0;
 
 	/* AR8031/AR8033 have different status registers
-- 
2.29.2


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] net: phy: at803x: fix at803x_match_phy_id mismatch
  2021-07-21 15:01 [PATCH] net: phy: at803x: fix at803x_match_phy_id mismatch Arnd Bergmann
@ 2021-07-21 15:02 ` Arnd Bergmann
  2021-07-21 15:03 ` Russell King (Oracle)
  1 sibling, 0 replies; 3+ messages in thread
From: Arnd Bergmann @ 2021-07-21 15:02 UTC (permalink / raw)
  To: Andrew Lunn, Heiner Kallweit
  Cc: Arnd Bergmann, Russell King, David S. Miller, Jakub Kicinski,
	David Bauer, Michael Walle, Ioana Ciornei, Ansuel Smith,
	Fabio Estevam, Networking, Linux Kernel Mailing List

On Wed, Jul 21, 2021 at 5:01 PM Arnd Bergmann <arnd@kernel.org> wrote:
>
> From: Arnd Bergmann <arnd@arndb.de>
>
> There are two conflicting patches in net-next, one removed ...

The email subject was meant to include [net-next], sorry for missing that.

       Arnd

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] net: phy: at803x: fix at803x_match_phy_id mismatch
  2021-07-21 15:01 [PATCH] net: phy: at803x: fix at803x_match_phy_id mismatch Arnd Bergmann
  2021-07-21 15:02 ` Arnd Bergmann
@ 2021-07-21 15:03 ` Russell King (Oracle)
  1 sibling, 0 replies; 3+ messages in thread
From: Russell King (Oracle) @ 2021-07-21 15:03 UTC (permalink / raw)
  To: Arnd Bergmann
  Cc: Andrew Lunn, Heiner Kallweit, Arnd Bergmann, David S. Miller,
	Jakub Kicinski, David Bauer, Michael Walle, Ioana Ciornei,
	Ansuel Smith, Fabio Estevam, netdev, linux-kernel

Patch already sent by Vladimir, and just applied.

On Wed, Jul 21, 2021 at 05:01:28PM +0200, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
> 
> There are two conflicting patches in net-next, one removed
> the at803x_get_features() function and the other added another
> user:
> 
> drivers/net/phy/at803x.c: In function 'at803x_get_features':
> drivers/net/phy/at803x.c:706:14: error: implicit declaration of function 'at803x_match_phy_id' [-Werror=implicit-function-declaration]
> 
> Change the new caller over to an open-coded comparison as well.
> 
> Fixes: 8887ca5474bd ("net: phy: at803x: simplify custom phy id matching")
> Fixes: b856150c8098 ("net: phy: at803x: mask 1000 Base-X link mode")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
>  drivers/net/phy/at803x.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/net/phy/at803x.c b/drivers/net/phy/at803x.c
> index 0790ffcd3db6..bdac087058b2 100644
> --- a/drivers/net/phy/at803x.c
> +++ b/drivers/net/phy/at803x.c
> @@ -703,7 +703,7 @@ static int at803x_get_features(struct phy_device *phydev)
>  	if (err)
>  		return err;
>  
> -	if (!at803x_match_phy_id(phydev, ATH8031_PHY_ID))
> +	if (phydev->drv->phy_id != ATH8031_PHY_ID)
>  		return 0;
>  
>  	/* AR8031/AR8033 have different status registers
> -- 
> 2.29.2
> 
> 

-- 
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/
FTTP is here! 40Mbps down 10Mbps up. Decent connectivity at last!

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2021-07-21 15:04 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-07-21 15:01 [PATCH] net: phy: at803x: fix at803x_match_phy_id mismatch Arnd Bergmann
2021-07-21 15:02 ` Arnd Bergmann
2021-07-21 15:03 ` Russell King (Oracle)

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).