netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] net: ftmac100: fix scheduling while atomic during PHY link status change
@ 2011-04-26 16:32 Adam Jaremko
  2011-04-28  9:11 ` Po-Yu Chuang
  2011-04-29 19:31 ` [PATCH] " David Miller
  0 siblings, 2 replies; 5+ messages in thread
From: Adam Jaremko @ 2011-04-26 16:32 UTC (permalink / raw)
  To: Ratbert Po-Yu Chuang(莊博宇); +Cc: ratbert.chuang, netdev

Signed-off-by: Adam Jaremko <adam.jaremko@gmail.com>
---
 drivers/net/ftmac100.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/net/ftmac100.c b/drivers/net/ftmac100.c
index a316619..9bd7746 100644
--- a/drivers/net/ftmac100.c
+++ b/drivers/net/ftmac100.c
@@ -139,11 +139,11 @@ static int ftmac100_reset(struct ftmac100 *priv)
 			 * that hardware reset completed (what the f*ck).
 			 * We still need to wait for a while.
 			 */
-			usleep_range(500, 1000);
+			udelay(500);
 			return 0;
 		}

-		usleep_range(1000, 10000);
+		udelay(1000);
 	}

 	netdev_err(netdev, "software reset failed\n");
@@ -772,7 +772,7 @@ static int ftmac100_mdio_read(struct net_device
*netdev, int phy_id, int reg)
 		if ((phycr & FTMAC100_PHYCR_MIIRD) == 0)
 			return phycr & FTMAC100_PHYCR_MIIRDATA;

-		usleep_range(100, 1000);
+		udelay(100);
 	}

 	netdev_err(netdev, "mdio read timed out\n");
@@ -801,7 +801,7 @@ static void ftmac100_mdio_write(struct net_device
*netdev, int phy_id, int reg,
 		if ((phycr & FTMAC100_PHYCR_MIIWR) == 0)
 			return;

-		usleep_range(100, 1000);
+		udelay(100);
 	}

 	netdev_err(netdev, "mdio write timed out\n");
-- 
1.7.4.4

^ permalink raw reply related	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2011-04-29 19:42 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-04-26 16:32 [PATCH] net: ftmac100: fix scheduling while atomic during PHY link status change Adam Jaremko
2011-04-28  9:11 ` Po-Yu Chuang
2011-04-28 17:41   ` [PATCH v2] " Adam Jaremko
2011-04-29 19:42     ` David Miller
2011-04-29 19:31 ` [PATCH] " 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).