Thread (3 messages) 3 messages, 3 authors, 2012-03-21

Re: [PATCH 1/1] net: phylib: add error checking if no phy found

From: Florian Fainelli <florian@openwrt.org>
Date: 2012-03-13 14:34:36
Also in: linux-arm-kernel, lkml

Hi,

Le 03/13/12 11:58, Dong Aisheng a écrit :
quoted hunk ↗ jump to hunk
From: Dong Aisheng<redacted>

Signed-off-by: Dong Aisheng<redacted>
---
  drivers/net/phy/mdio_bus.c |   11 ++++++++++-
  1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 88cc5db..d8e044d 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -101,6 +101,7 @@ static struct class mdio_bus_class = {
  int mdiobus_register(struct mii_bus *bus)
  {
  	int i, err;
+	u32 phynum = 0;

  	if (NULL == bus || NULL == bus->name ||
  			NULL == bus->read ||
@@ -134,12 +135,20 @@ int mdiobus_register(struct mii_bus *bus)
  			if (IS_ERR(phydev)) {
  				err = PTR_ERR(phydev);
  				goto error;
+			} else if (phydev != NULL) {
+				phynum++;
  			}
  		}
  	}

+	if (!phynum) {
+		err = -ENODEV;
+		printk(KERN_ERR "%s: no phys found\n", bus->name);
+		goto error;
+	}
I am not sure if this is a good idea to change it, especially if:
- the MII bus probing is also done later (quite some drivers do this)
- if we want to attach a fixed PHY because we could not probe one at registration time
quoted hunk ↗ jump to hunk
+
  	bus->state = MDIOBUS_REGISTERED;
-	pr_info("%s: probed\n", bus->name);
+	pr_info("%s: %d phys probed\n", bus->name, phynum);
  	return 0;

  error:
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help