netdev - Re: [PACH] smsc911x: replace manual phy lookup.

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20100217081449.GA3360@psychotron.redhat.com>
Date:	Wed, 17 Feb 2010 09:15:13 +0100
From:	Jiri Pirko <jpirko@...hat.com>
To:	davem@...emloft.net, steve.glendinning@...c.com,
	netdev@...r.kernel.org
Subject: Re: [PACH] smsc911x: replace manual phy lookup.

Wed, Feb 17, 2010 at 08:54:58AM CET, kirjanov@...il.com wrote:
>Use phy_find_first() function instead of manual lookup.
>
>Signed-off-by: Denis Kirjanov <kirjanov@...il.com>
>
>---
>
> drivers/net/smsc911x.c |   24 ++++++++++--------------
> 1 files changed, 10 insertions(+), 14 deletions(-)
>
>diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c
>index 3c1f9aa..13c0b76 100644
>--- a/drivers/net/smsc911x.c
>+++ b/drivers/net/smsc911x.c
>@@ -770,29 +770,25 @@ static int smsc911x_mii_probe(struct net_device *dev)
> {
> 	struct smsc911x_data *pdata = netdev_priv(dev);
> 	struct phy_device *phydev = NULL;
>-	int phy_addr;
>+	int ret;
> 
> 	/* find the first phy */
>-	for (phy_addr = 0; phy_addr < PHY_MAX_ADDR; phy_addr++) {
>-		if (pdata->mii_bus->phy_map[phy_addr]) {
>-			phydev = pdata->mii_bus->phy_map[phy_addr];
>-			SMSC_TRACE(PROBE, "PHY %d: addr %d, phy_id 0x%08X",
>-				phy_addr, phydev->addr, phydev->phy_id);
>-			break;
>-		}
>-	}
>-
>+	phydev = phy_find_first(pdata->mii_bus);
> 	if (!phydev) {
> 		pr_err("%s: no PHY found\n", dev->name);
> 		return -ENODEV;
> 	}
> 
>-	phydev = phy_connect(dev, dev_name(&phydev->dev),
>-		&smsc911x_phy_adjust_link, 0, pdata->config.phy_interface);
>+	SMSC_TRACE(PROBE, "PHY %d: addr %d, phy_id 0x%08X",
>+			phy_addr, phydev->addr, phydev->phy_id);
>+
>+	ret = phy_connect_direct(dev, phydev,
>+			&smsc911x_phy_adjust_link, 0,
>+			pdata->config.phy_interface);
> 
>-	if (IS_ERR(phydev)) {
>+	if (ret) {
> 		pr_err("%s: Could not attach to PHY\n", dev->name);
>-		return PTR_ERR(phydev);
>+		return ret;
> 	}
> 
> 	pr_info("%s: attached PHY driver [%s] (mii_bus:phy_addr=%s, irq=%d)\n",

Looks good to me.

Reviewed-by: Jiri Pirko <jpirko@...hat.com>

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html