* [PACH] smsc911x: replace manual phy lookup.
@ 2010-02-17 7:54 Denis Kirjanov <kirjanov@gmail.com
2010-02-17 8:15 ` Jiri Pirko
2010-02-18 0:03 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Denis Kirjanov <kirjanov@gmail.com @ 2010-02-17 7:54 UTC (permalink / raw)
To: davem; +Cc: steve.glendinning, jpirko, netdev
Use phy_find_first() function instead of manual lookup.
Signed-off-by: Denis Kirjanov <kirjanov@gmail.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",
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PACH] smsc911x: replace manual phy lookup.
2010-02-17 7:54 [PACH] smsc911x: replace manual phy lookup Denis Kirjanov <kirjanov@gmail.com
@ 2010-02-17 8:15 ` Jiri Pirko
2010-02-18 0:03 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Jiri Pirko @ 2010-02-17 8:15 UTC (permalink / raw)
To: davem, steve.glendinning, netdev
Wed, Feb 17, 2010 at 08:54:58AM CET, kirjanov@gmail.com wrote:
>Use phy_find_first() function instead of manual lookup.
>
>Signed-off-by: Denis Kirjanov <kirjanov@gmail.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@redhat.com>
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PACH] smsc911x: replace manual phy lookup.
2010-02-17 7:54 [PACH] smsc911x: replace manual phy lookup Denis Kirjanov <kirjanov@gmail.com
2010-02-17 8:15 ` Jiri Pirko
@ 2010-02-18 0:03 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2010-02-18 0:03 UTC (permalink / raw)
To: "kirjanov, kirjanov; +Cc: steve.glendinning, jpirko, netdev
From: "Denis Kirjanov <kirjanov@gmail.com" <kirjanov@gmail.com>
Date: Wed, 17 Feb 2010 10:54:58 +0300
> Use phy_find_first() function instead of manual lookup.
>
> Signed-off-by: Denis Kirjanov <kirjanov@gmail.com>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-02-18 0:02 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-17 7:54 [PACH] smsc911x: replace manual phy lookup Denis Kirjanov <kirjanov@gmail.com
2010-02-17 8:15 ` Jiri Pirko
2010-02-18 0:03 ` David Miller
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).