From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 2/2] mdiobus: do not scan the bus at registration time
Date: Tue, 30 Oct 2012 17:32:37 +0100 [thread overview]
Message-ID: <1351614757-20520-3-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1351614757-20520-1-git-send-email-s.hauer@pengutronix.de>
Scanning the bus can take some time. If we do not need the ethernet
device, this is unnecessary, so delay the scan until the phy device
iactually is needed.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/net/phy/mdio_bus.c | 23 +----------------------
drivers/net/phy/phy.c | 4 ++--
2 files changed, 3 insertions(+), 24 deletions(-)
diff --git a/drivers/net/phy/mdio_bus.c b/drivers/net/phy/mdio_bus.c
index 5025e3f..35319b4 100644
--- a/drivers/net/phy/mdio_bus.c
+++ b/drivers/net/phy/mdio_bus.c
@@ -36,7 +36,7 @@
*/
int mdiobus_register(struct mii_bus *bus)
{
- int i, err;
+ int err;
if (NULL == bus ||
NULL == bus->read ||
@@ -59,29 +59,8 @@ int mdiobus_register(struct mii_bus *bus)
if (bus->reset)
bus->reset(bus);
- for (i = 0; i < PHY_MAX_ADDR; i++) {
- if ((bus->phy_mask & (1 << i)) == 0) {
- struct phy_device *phydev;
-
- phydev = mdiobus_scan(bus, i);
- if (IS_ERR(phydev)) {
- err = PTR_ERR(phydev);
- goto error;
- }
- }
- }
-
pr_info("%s: probed\n", dev_name(&bus->dev));
return 0;
-
-error:
- while (--i >= 0) {
- if (bus->phy_map[i]) {
- kfree(bus->phy_map[i]);
- bus->phy_map[i] = NULL;
- }
- }
- return err;
}
EXPORT_SYMBOL(mdiobus_register);
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 88c3ff7..8d36300 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -154,7 +154,7 @@ int phy_device_connect(struct eth_device *edev, struct mii_bus *bus, int addr,
if (!edev->phydev) {
if (addr >= 0) {
- dev = bus->phy_map[addr];
+ dev = mdiobus_scan(bus, addr);
if (!dev) {
ret = -EIO;
goto fail;
@@ -169,7 +169,7 @@ int phy_device_connect(struct eth_device *edev, struct mii_bus *bus, int addr,
goto fail;
} else {
for (i = 0; i < PHY_MAX_ADDR && !edev->phydev; i++) {
- dev = bus->phy_map[i];
+ dev = mdiobus_scan(bus, addr);
if (!dev || dev->attached_dev)
continue;
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2012-10-30 16:32 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-30 16:32 [PATCH] phylib delayed scan Sascha Hauer
2012-10-30 16:32 ` [PATCH 1/2] mdiobus: return existing phydev in mdiobus_scan Sascha Hauer
2012-10-30 16:32 ` Sascha Hauer [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1351614757-20520-3-git-send-email-s.hauer@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox