From: Nishanth Aravamudan <nacc@us.ibm.com>
To: kernel-janitors@vger.kernel.org
Subject: [Kernel-janitors] [PATCH 2.6.9-rc2 14/38] net/g96100eth: replace
Date: Thu, 23 Sep 2004 17:35:47 +0000 [thread overview]
Message-ID: <20040923173547.GA2154@us.ibm.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 2554 bytes --]
Any comments would be appreciated.
Description: Use msleep_interruptible() instead of gt96100_delay() so
that the task delays as expected. Remove the prototype and definition of
gt96100_delay(). As I currently understand it, the check for interrupt
context is not necessary in gt96100_delay(), as such a sleep will be
caught within the scheduler.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
--- 2.6.9-rc2-vanilla/drivers/net/gt96100eth.c 2004-09-13 17:15:45.000000000 -0700
+++ 2.6.9-rc2/drivers/net/gt96100eth.c 2004-09-23 10:27:16.000000000 -0700
@@ -59,7 +59,6 @@
// prototypes
static void* dmaalloc(size_t size, dma_addr_t *dma_handle);
static void dmafree(size_t size, void *vaddr);
-static void gt96100_delay(int msec);
static int gt96100_add_hash_entry(struct net_device *dev,
unsigned char* addr);
static void read_mib_counters(struct gt96100_private *gp);
@@ -183,16 +182,6 @@ static void dmafree(size_t size, void *v
free_pages((unsigned long)vaddr, get_order(size));
}
-static void gt96100_delay(int ms)
-{
- if (in_interrupt())
- return;
- else {
- current->state = TASK_INTERRUPTIBLE;
- schedule_timeout(ms*HZ/1000);
- }
-}
-
static int
parse_mac_addr(struct net_device *dev, char* macstr)
{
@@ -238,7 +227,7 @@ read_MII(int phy_addr, u32 reg)
// wait for last operation to complete
while (GT96100_READ(GT96100_ETH_SMI_REG) & smirBusy) {
// snooze for 1 msec and check again
- gt96100_delay(1);
+ msleep_interruptible(1);
if (--timedout == 0) {
printk(KERN_ERR "%s: busy timeout!!\n", __FUNCTION__);
@@ -252,7 +241,7 @@ read_MII(int phy_addr, u32 reg)
// wait for read to complete
while (!((smir = GT96100_READ(GT96100_ETH_SMI_REG)) & smirReadValid)) {
// snooze for 1 msec and check again
- gt96100_delay(1);
+ msleep_interruptible(1);
if (--timedout == 0) {
printk(KERN_ERR "%s: timeout!!\n", __FUNCTION__);
@@ -304,7 +293,7 @@ write_MII(int phy_addr, u32 reg, u16 dat
// wait for last operation to complete
while (GT96100_READ(GT96100_ETH_SMI_REG) & smirBusy) {
// snooze for 1 msec and check again
- gt96100_delay(1);
+ msleep_interruptible(1);
if (--timedout == 0) {
printk(KERN_ERR "%s: busy timeout!!\n", __FUNCTION__);
@@ -528,7 +517,7 @@ abort(struct net_device *dev, u32 abort_
// wait for abort to complete
while (GT96100ETH_READ(gp, GT96100_ETH_SDMA_COMM) & abort_bits) {
// snooze for 20 msec and check again
- gt96100_delay(1);
+ msleep_interruptible(20);
if (--timedout == 0) {
err("%s: timeout!!\n", __FUNCTION__);
[-- Attachment #2: Type: text/plain, Size: 167 bytes --]
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors
reply other threads:[~2004-09-23 17:35 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20040923173547.GA2154@us.ibm.com \
--to=nacc@us.ibm.com \
--cc=kernel-janitors@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.