From: Jörg Krause <joerg.krause@embedded.rocks>
Date: Wed, 15 Jul 2015 13:18:22 +0000 (+0200)
Subject: net: phy: delay only if reset handler is registered
X-Git-Tag: KARO-TX6-2015-09-18~508
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=b84fa855427f4b033542588c84a8667dfd1d3792

net: phy: delay only if reset handler is registered

With commit e3a77218a256edbe201112a39beeed8adcabae3f the MII bus is only
reset if a reset handler is registered. If there is no reset handler there
is no need to wait for a device to come out of the reset.

Signed-off-by: Jörg Krause <joerg.krause@embedded.rocks>
---

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 106f9b0150..f3b1b5c1ed 100644
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -882,11 +882,13 @@ struct phy_device *phy_find_by_mask(struct mii_dev *bus, unsigned phy_mask,
 		phy_interface_t interface)
 {
 	/* Reset the bus */
-	if (bus->reset)
+	if (bus->reset) {
 		bus->reset(bus);
 
-	/* Wait 15ms to make sure the PHY has come out of hard reset */
-	udelay(15000);
+		/* Wait 15ms to make sure the PHY has come out of hard reset */
+		udelay(15000);
+	}
+
 	return get_phy_device_by_mask(bus, phy_mask, interface);
 }