* [patch 12/18] net/sb1000: replace nicedelay() with msleep_interruptible()
@ 2004-10-30 22:42 janitor
2004-10-31 11:05 ` Jeff Garzik
0 siblings, 1 reply; 3+ messages in thread
From: janitor @ 2004-10-30 22:42 UTC (permalink / raw)
To: jgarzik; +Cc: netdev, janitor, nacc
Any comments would be appreciated.
Description: Use msleep_interruptible() instead of nicedelay()
to guarantee the task delays as expected. Remove the prototype and
definition of nicedelay(). This is a very weird function, because it is
called to sleep in terms of usecs, but always sleeps for 1 second,
completely ignoring the parameter. I have gone ahead and followed suit,
just sleeping for a second in all cases, but maybe someone with the
hardware could tell me if perhaps the paramter *should* matter.
Also remove a random "^L" character.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
---
linux-2.6.10-rc1-max/drivers/net/sb1000.c | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diff -puN drivers/net/sb1000.c~msleep_interruptible-drivers_net_sb1000 drivers/net/sb1000.c
--- linux-2.6.10-rc1/drivers/net/sb1000.c~msleep_interruptible-drivers_net_sb1000 2004-10-24 17:05:15.000000000 +0200
+++ linux-2.6.10-rc1-max/drivers/net/sb1000.c 2004-10-24 17:05:15.000000000 +0200
@@ -90,7 +90,6 @@ static int sb1000_close(struct net_devic
/* SB1000 hardware routines to be used during open/configuration phases */
-static inline void nicedelay(unsigned long usecs);
static inline int card_wait_for_busy_clear(const int ioaddr[],
const char* name);
static inline int card_wait_for_ready(const int ioaddr[], const char* name,
@@ -247,20 +246,12 @@ static struct pnp_driver sb1000_driver =
.remove = sb1000_remove_one,
};
-\f
/*
* SB1000 hardware routines to be used during open/configuration phases
*/
const int TimeOutJiffies = (875 * HZ) / 100;
-static inline void nicedelay(unsigned long usecs)
-{
- current->state = TASK_INTERRUPTIBLE;
- schedule_timeout(HZ);
- return;
-}
-
/* Card Wait For Busy Clear (cannot be used during an interrupt) */
static inline int
card_wait_for_busy_clear(const int ioaddr[], const char* name)
@@ -475,7 +466,7 @@ sb1000_reset(const int ioaddr[], const c
udelay(1000);
outb(0x0, port);
inb(port);
- nicedelay(60000);
+ msleep_interruptible(1000);
outb(0x4, port);
inb(port);
udelay(1000);
@@ -537,7 +528,7 @@ sb1000_activate(const int ioaddr[], cons
const unsigned char Command0[6] = {0x80, 0x11, 0x00, 0x00, 0x00, 0x00};
const unsigned char Command1[6] = {0x80, 0x16, 0x00, 0x00, 0x00, 0x00};
- nicedelay(50000);
+ msleep_interruptible(1000);
if ((status = card_send_command(ioaddr, name, Command0, st)))
return status;
if ((status = card_send_command(ioaddr, name, Command1, st)))
@@ -944,7 +935,7 @@ sb1000_open(struct net_device *dev)
/* initialize sb1000 */
if ((status = sb1000_reset(ioaddr, name)))
return status;
- nicedelay(200000);
+ msleep_interruptible(1000);
if ((status = sb1000_check_CRC(ioaddr, name)))
return status;
_
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [patch 12/18] net/sb1000: replace nicedelay() with msleep_interruptible()
2004-10-30 22:42 [patch 12/18] net/sb1000: replace nicedelay() with msleep_interruptible() janitor
@ 2004-10-31 11:05 ` Jeff Garzik
2004-11-01 20:24 ` [PATCH] net/sb1000: replace nicedelay() with ssleep_interruptible() Nishanth Aravamudan
0 siblings, 1 reply; 3+ messages in thread
From: Jeff Garzik @ 2004-10-31 11:05 UTC (permalink / raw)
To: janitor; +Cc: netdev, nacc
janitor@sternwelten.at wrote:
> Any comments would be appreciated.
>
> Description: Use msleep_interruptible() instead of nicedelay()
> to guarantee the task delays as expected. Remove the prototype and
> definition of nicedelay(). This is a very weird function, because it is
> called to sleep in terms of usecs, but always sleeps for 1 second,
> completely ignoring the parameter. I have gone ahead and followed suit,
> just sleeping for a second in all cases, but maybe someone with the
> hardware could tell me if perhaps the paramter *should* matter.
> Also remove a random "^L" character.
use ssleep() here too
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] net/sb1000: replace nicedelay() with ssleep_interruptible()
2004-10-31 11:05 ` Jeff Garzik
@ 2004-11-01 20:24 ` Nishanth Aravamudan
0 siblings, 0 replies; 3+ messages in thread
From: Nishanth Aravamudan @ 2004-11-01 20:24 UTC (permalink / raw)
To: Jeff Garzik; +Cc: kernel-janitors, netdev
On Sun, Oct 31, 2004 at 06:05:15AM -0500, Jeff Garzik wrote:
> janitor@sternwelten.at wrote:
> >Any comments would be appreciated.
> >
> >Description: Use msleep_interruptible() instead of nicedelay()
> >to guarantee the task delays as expected. Remove the prototype and
> >definition of nicedelay(). This is a very weird function, because it is
> >called to sleep in terms of usecs, but always sleeps for 1 second,
> >completely ignoring the parameter. I have gone ahead and followed suit,
> >just sleeping for a second in all cases, but maybe someone with the
> >hardware could tell me if perhaps the paramter *should* matter.
> >Also remove a random "^L" character.
>
> use ssleep() here too
Done, please fine patch below:
Description: Use ssleep_interruptible() instead of nicedelay()
to guarantee the task delays as expected. Remove the prototype and
definition of nicedelay(). This is a very weird function, because it is
called to sleep in terms of usecs, but always sleeps for 1 second,
completely ignoring the parameter. I have gone ahead and followed suit,
just sleeping for a second in all cases, but maybe someone with the
hardware could tell me if perhaps the paramter *should* matter.
escription.
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
--- 2.6.10-rc1-vanilla/drivers/net/sb1000.c 2004-10-30 15:33:28.000000000 -0700
+++ 2.6.10-rc1/drivers/net/sb1000.c 2004-11-01 12:22:26.000000000 -0800
@@ -90,7 +90,6 @@ static int sb1000_close(struct net_devic
/* SB1000 hardware routines to be used during open/configuration phases */
-static inline void nicedelay(unsigned long usecs);
static inline int card_wait_for_busy_clear(const int ioaddr[],
const char* name);
static inline int card_wait_for_ready(const int ioaddr[], const char* name,
@@ -254,13 +253,6 @@ static struct pnp_driver sb1000_driver =
const int TimeOutJiffies = (875 * HZ) / 100;
-static inline void nicedelay(unsigned long usecs)
-{
- current->state = TASK_INTERRUPTIBLE;
- schedule_timeout(HZ);
- return;
-}
-
/* Card Wait For Busy Clear (cannot be used during an interrupt) */
static inline int
card_wait_for_busy_clear(const int ioaddr[], const char* name)
@@ -475,7 +467,7 @@ sb1000_reset(const int ioaddr[], const c
udelay(1000);
outb(0x0, port);
inb(port);
- nicedelay(60000);
+ ssleep_interruptible(1);
outb(0x4, port);
inb(port);
udelay(1000);
@@ -537,7 +529,7 @@ sb1000_activate(const int ioaddr[], cons
const unsigned char Command0[6] = {0x80, 0x11, 0x00, 0x00, 0x00, 0x00};
const unsigned char Command1[6] = {0x80, 0x16, 0x00, 0x00, 0x00, 0x00};
- nicedelay(50000);
+ ssleep_interruptible(1);
if ((status = card_send_command(ioaddr, name, Command0, st)))
return status;
if ((status = card_send_command(ioaddr, name, Command1, st)))
@@ -944,7 +936,7 @@ sb1000_open(struct net_device *dev)
/* initialize sb1000 */
if ((status = sb1000_reset(ioaddr, name)))
return status;
- nicedelay(200000);
+ ssleep_interruptible(1);
if ((status = sb1000_check_CRC(ioaddr, name)))
return status;
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2004-11-01 20:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2004-10-30 22:42 [patch 12/18] net/sb1000: replace nicedelay() with msleep_interruptible() janitor
2004-10-31 11:05 ` Jeff Garzik
2004-11-01 20:24 ` [PATCH] net/sb1000: replace nicedelay() with ssleep_interruptible() Nishanth Aravamudan
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).