public inbox for netdev@vger.kernel.org
 help / color / mirror / Atom feed
From: Adam Jaremko <adam.jaremko@gmail.com>
To: Po-Yu Chuang <ratbert.chuang@gmail.com>
Cc: "Ratbert Po-Yu Chuang(莊博宇)" <ratbert@faraday-tech.com>,
	netdev@vger.kernel.org, "David Miller" <davem@davemloft.net>,
	"Eric Dumazet" <eric.dumazet@gmail.com>
Subject: [PATCH v2] net: ftmac100: fix scheduling while atomic during PHY link status change
Date: Thu, 28 Apr 2011 13:41:18 -0400	[thread overview]
Message-ID: <1304012478.3715.5.camel@localhost.localdomain> (raw)
In-Reply-To: <BANLkTinB1FiHYX1KoO90UepmhQdXZs0eEg@mail.gmail.com>

I think I've sorted my mail client preferences and all should be well now.

Signed-off-by: Adam Jaremko <adam.jaremko@gmail.com>
Acked-by: Po-Yu Chuang <ratbert@faraday-tech.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


  reply	other threads:[~2011-04-28 17:41 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
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   ` Adam Jaremko [this message]
2011-04-29 19:42     ` [PATCH v2] " David Miller
2011-04-29 19:31 ` [PATCH] " David Miller

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=1304012478.3715.5.camel@localhost.localdomain \
    --to=adam.jaremko@gmail.com \
    --cc=davem@davemloft.net \
    --cc=eric.dumazet@gmail.com \
    --cc=netdev@vger.kernel.org \
    --cc=ratbert.chuang@gmail.com \
    --cc=ratbert@faraday-tech.com \
    /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