[PATCH -next 1/2] net: tc35815: Fix build error due to missed API change

Path	csiph.com!eternal-september.org!feeder.eternal-september.org!aioe.org!news.servidellagleba.it!bofh.it!news.nic.it!robomod
From	Guenter Roeck <linux@roeck-us.net>
Newsgroups	linux.kernel
Subject	[PATCH -next 1/2] net: tc35815: Fix build error due to missed API change
Date	Sat, 09 Jan 2016 22:30:02 +0100
Message-ID	<qP9fc-2RT-11@gated-at.bofh.it> (permalink)
X-Original-To	netdev@vger.kernel.org
Dkim-Signature	v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=roeck-us.net; s=default; h=Message-Id:Date:Subject:Cc:To:From; bh=2gispWBMo5UslQ8GAad1Z2SuekrhvZefXJCj6usPU3A=; b=gaX++ROzjU0BTz5qYpmIK9kmV+ d5eGwpUQ8hebC5LImFRv90xoBw4AjQM2M4VbqKdv2E/gFV/n6XeEayi1JHC/gSGNTp+nfH2iJ50mz /KaONxkfwrWJw9etFFjbqtc4Q6JAJhbdA8M+QqeuLI5LV+wI2plantcLe98U1kR4eNgw=;
X-Mailer	git-send-email 2.1.4
X-Authenticated_Sender	guenter@roeck-us.net
X-Outgoing-Spam-Status	No, score=-1.0
X-Antiabuse	This header was added to track abuse, please include it with any abuse report
X-Antiabuse	Primary Hostname - bh-25.webhostbox.net
X-Antiabuse	Original Domain - vger.kernel.org
X-Antiabuse	Originator/Caller UID/GID - [47 12] / [47 12]
X-Antiabuse	Sender Address Domain - roeck-us.net
X-Get-Message-Sender-Via	bh-25.webhostbox.net: authenticated_id: guenter@roeck-us.net
X-Authenticated-Sender	bh-25.webhostbox.net: guenter@roeck-us.net
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	42
Organization	linux.* mail to news gateway
X-Original-Cc	linux-kernel@vger.kernel.org, Guenter Roeck <linux@roeck-us.net>, Andrew Lunn <andrew@lunn.ch>
X-Original-Date	Sat, 9 Jan 2016 13:21:33 -0800
X-Original-Message-ID	<1452374494-18752-1-git-send-email-linux@roeck-us.net>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1305361

Show key headers only | View raw

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 <andrew@lunn.ch>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
 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;
 		}
 	}
-- 
2.1.4

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH -next 1/2] net: tc35815: Fix build error due to missed API change Guenter Roeck <linux@roeck-us.net> - 2016-01-09 22:30 +0100
  Re: [PATCH -next 1/2] net: tc35815: Fix build error due to missed  API change Andrew Lunn <andrew@lunn.ch> - 2016-01-09 22:40 +0100
    Re: [PATCH -next 1/2] net: tc35815: Fix build error due to missed API  change Guenter Roeck <linux@roeck-us.net> - 2016-01-09 23:00 +0100
      Re: [PATCH -next 1/2] net: tc35815: Fix build error due to missed  API change Andrew Lunn <andrew@lunn.ch> - 2016-01-09 23:10 +0100
        Re: [PATCH -next 1/2] net: tc35815: Fix build error due to missed API  change Guenter Roeck <linux@roeck-us.net> - 2016-01-10 03:50 +0100

csiph-web