Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Wed, 21 Jul 2021 16:03:00 +0100
From:   "Russell King (Oracle)" <linux@armlinux.org.uk>
To:     Arnd Bergmann <arnd@kernel.org>
Cc:     Andrew Lunn <andrew@lunn.ch>,
        Heiner Kallweit <hkallweit1@gmail.com>,
        Arnd Bergmann <arnd@arndb.de>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        David Bauer <mail@david-bauer.net>,
        Michael Walle <michael@walle.cc>,
        Ioana Ciornei <ioana.ciornei@nxp.com>,
        Ansuel Smith <ansuelsmth@gmail.com>,
        Fabio Estevam <festevam@gmail.com>, netdev@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH] net: phy: at803x: fix at803x_match_phy_id mismatch
Message-ID: <20210721150300.GA22278@shell.armlinux.org.uk>
References: <20210721150141.1737124-1-arnd@kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20210721150141.1737124-1-arnd@kernel.org>
User-Agent: Mutt/1.10.1 (2018-07-13)
Sender: Russell King (Oracle) <linux@armlinux.org.uk>
Precedence: bulk

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!