From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756235AbcAIVgS (ORCPT ); Sat, 9 Jan 2016 16:36:18 -0500 Received: from vps0.lunn.ch ([178.209.37.122]:44640 "EHLO vps0.lunn.ch" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752850AbcAIVgQ (ORCPT ); Sat, 9 Jan 2016 16:36:16 -0500 Date: Sat, 9 Jan 2016 22:36:14 +0100 From: Andrew Lunn To: Guenter Roeck Cc: netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH -next 1/2] net: tc35815: Fix build error due to missed API change Message-ID: <20160109213614.GC6877@lunn.ch> References: <1452374494-18752-1-git-send-email-linux@roeck-us.net> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1452374494-18752-1-git-send-email-linux@roeck-us.net> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Sat, Jan 09, 2016 at 01:21:33PM -0800, Guenter Roeck wrote: > Commit 7f854420fbfe ("phy: Add API for {un}registering an mdio device to > a bus") introduces an API to access mii_bus structures, but missed to > update the tc35815 driver. This results in the following error message. > > drivers/net/ethernet/toshiba/tc35815.c: In function 'tc_mii_probe': > drivers/net/ethernet/toshiba/tc35815.c:617:18: error: > 'struct mii_bus' has no member named 'phy_map' > drivers/net/ethernet/toshiba/tc35815.c:623:24: error: > 'struct mii_bus' has no member named 'phy_map' > > Fixes: 7f854420fbfe ("phy: Add API for {un}registering an mdio device to a bus") > Cc: Andrew Lunn > Signed-off-by: Guenter Roeck > --- > drivers/net/ethernet/toshiba/tc35815.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/net/ethernet/toshiba/tc35815.c b/drivers/net/ethernet/toshiba/tc35815.c > index fed5e3dfbc8f..5b5e7dcf9a99 100644 > --- a/drivers/net/ethernet/toshiba/tc35815.c > +++ b/drivers/net/ethernet/toshiba/tc35815.c > @@ -614,13 +614,16 @@ static int tc_mii_probe(struct net_device *dev) > > /* find the first phy */ > for (phy_addr = 0; phy_addr < PHY_MAX_ADDR; phy_addr++) { > - if (lp->mii_bus->phy_map[phy_addr]) { > + struct phy_device *tmp_phy; > + > + tmp_phy = mdiobus_get_phy(lp->mii_bus, phy_addr); > + if (tmp_phy) { > if (phydev) { > printk(KERN_ERR "%s: multiple PHYs found\n", > dev->name); > return -EINVAL; > } > - phydev = lp->mii_bus->phy_map[phy_addr]; > + phydev = tmp_phy; > break; > } > } Hi Guenter You fix looks right, but i'm wondering about the code which is being fixed. How can phydev ever evaluate to true, given the break statement? Can this code every detect multiple PHYs? I think not. Either the break needs to be removed, or we just replace the whole lot with phy_find_first(). Andrew