* [patch 13/18] net/cycx_drv: replace delay_cycx() with msleep_interruptible()
@ 2004-10-30 22:43 janitor
2004-10-31 11:04 ` Jeff Garzik
0 siblings, 1 reply; 3+ messages in thread
From: janitor @ 2004-10-30 22:43 UTC (permalink / raw)
To: jgarzik; +Cc: netdev, janitor, nacc, acme
Any comments would be appreciated.
Description: Use msleep_interruptible() instead of delay_cycx()
to guarantee the task delays as expected. Remove the prototype and
definition of delay_cycx().
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Acked-by: Arnaldo Carvalho de Melo <acme@conectiva.com.br>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
---
linux-2.6.10-rc1-max/drivers/net/wan/cycx_drv.c | 24 ++++++++----------------
1 files changed, 8 insertions(+), 16 deletions(-)
diff -puN drivers/net/wan/cycx_drv.c~msleep_interruptible-drivers_net_wan_cycx_drv drivers/net/wan/cycx_drv.c
--- linux-2.6.10-rc1/drivers/net/wan/cycx_drv.c~msleep_interruptible-drivers_net_wan_cycx_drv 2004-10-24 17:05:17.000000000 +0200
+++ linux-2.6.10-rc1-max/drivers/net/wan/cycx_drv.c 2004-10-24 17:05:17.000000000 +0200
@@ -56,7 +56,7 @@
#include <linux/sched.h> /* for jiffies, HZ, etc. */
#include <linux/cycx_drv.h> /* API definitions */
#include <linux/cycx_cfm.h> /* CYCX firmware module definitions */
-#include <linux/delay.h> /* udelay */
+#include <linux/delay.h> /* udelay, msleep */
#include <asm/io.h> /* read[wl], write[wl], ioremap, iounmap */
#define MOD_VERSION 0
@@ -74,7 +74,6 @@ static int reset_cyc2x(void __iomem *add
static int detect_cyc2x(void __iomem *addr);
/* Miscellaneous functions */
-static void delay_cycx(int sec);
static int get_option_index(long *optlist, long optval);
static u16 checksum(u8 *buf, u32 len);
@@ -259,7 +258,7 @@ static int memory_exists(void __iomem *a
if (readw(addr + 0x10) == TEST_PATTERN)
return 1;
- delay_cycx(1);
+ msleep_interruptible(1000);
}
return 0;
@@ -316,7 +315,7 @@ static void cycx_reset_boot(void __iomem
/* 80186 was in hold, go */
writeb(0, addr + START_CPU);
- delay_cycx(1);
+ msleep_interruptible(1000);
}
/* Load data.bin file through boot (reset) interface. */
@@ -462,13 +461,13 @@ static int load_cyc2x(struct cycx_hw *hw
cycx_reset_boot(hw->dpmbase, reset_image, img_hdr->reset_size);
/* reset is waiting for boot */
writew(GEN_POWER_ON, pt_cycld);
- delay_cycx(1);
+ msleep_interruptible(1000);
for (j = 0 ; j < 3 ; j++)
if (!readw(pt_cycld))
goto reset_loaded;
else
- delay_cycx(1);
+ msleep_interruptible(1000);
}
printk(KERN_ERR "%s: reset not started.\n", modname);
@@ -495,7 +494,7 @@ reset_loaded:
/* Arthur Ganzert's tip: wait a while after the firmware loading...
seg abr 26 17:17:12 EST 1999 - acme */
- delay_cycx(7);
+ msleep_interruptible(7000);
printk(KERN_INFO "%s: firmware loaded!\n", modname);
/* enable interrupts */
@@ -547,20 +546,13 @@ static int get_option_index(long *optlis
static int reset_cyc2x(void __iomem *addr)
{
writeb(0, addr + RST_ENABLE);
- delay_cycx(2);
+ msleep_interruptible(2000);
writeb(0, addr + RST_DISABLE);
- delay_cycx(2);
+ msleep_interruptible(2000);
return memory_exists(addr);
}
-/* Delay */
-static void delay_cycx(int sec)
-{
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(sec * HZ);
-}
-
/* Calculate 16-bit CRC using CCITT polynomial. */
static u16 checksum(u8 *buf, u32 len)
{
_
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [patch 13/18] net/cycx_drv: replace delay_cycx() with msleep_interruptible()
2004-10-30 22:43 [patch 13/18] net/cycx_drv: replace delay_cycx() with msleep_interruptible() janitor
@ 2004-10-31 11:04 ` Jeff Garzik
2004-11-01 19:48 ` [PATCH] net/cycx_drv: replace delay_cycx() with ssleep_interruptible() Nishanth Aravamudan
0 siblings, 1 reply; 3+ messages in thread
From: Jeff Garzik @ 2004-10-31 11:04 UTC (permalink / raw)
To: janitor; +Cc: netdev, nacc, acme
janitor@sternwelten.at wrote:
> -/* Delay */
> -static void delay_cycx(int sec)
> -{
> - set_current_state(TASK_INTERRUPTIBLE);
> - schedule_timeout(sec * HZ);
> -}
this _clearly_ wants an ssleep() derivative, not msleep()
Jeff
^ permalink raw reply [flat|nested] 3+ messages in thread
* [PATCH] net/cycx_drv: replace delay_cycx() with ssleep_interruptible()
2004-10-31 11:04 ` Jeff Garzik
@ 2004-11-01 19:48 ` Nishanth Aravamudan
0 siblings, 0 replies; 3+ messages in thread
From: Nishanth Aravamudan @ 2004-11-01 19:48 UTC (permalink / raw)
To: Jeff Garzik; +Cc: kernel-janitors, netdev, acme
On Sun, Oct 31, 2004 at 06:04:07AM -0500, Jeff Garzik wrote:
> janitor@sternwelten.at wrote:
> >-/* Delay */
> >-static void delay_cycx(int sec)
> >-{
> >- set_current_state(TASK_INTERRUPTIBLE);
> >- schedule_timeout(sec * HZ);
> >-}
>
>
> this _clearly_ wants an ssleep() derivative, not msleep()
Fixed, see patch below.
Description: Use ssleep_interruptible() instead of delay_cycx()
to guarantee the task delays as expected. Remove the prototype and
definition of delay_cycx().
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
--- 2.6.10-rc1-vanilla/drivers/net/wan/cycx_drv.c 2004-10-30 15:33:28.000000000 -0700
+++ 2.6.10-rc1/drivers/net/wan/cycx_drv.c 2004-11-01 11:46:08.000000000 -0800
@@ -74,7 +74,6 @@ static int reset_cyc2x(void __iomem *add
static int detect_cyc2x(void __iomem *addr);
/* Miscellaneous functions */
-static void delay_cycx(int sec);
static int get_option_index(long *optlist, long optval);
static u16 checksum(u8 *buf, u32 len);
@@ -259,7 +258,7 @@ static int memory_exists(void __iomem *a
if (readw(addr + 0x10) == TEST_PATTERN)
return 1;
- delay_cycx(1);
+ ssleep_interruptible(1);
}
return 0;
@@ -316,7 +315,7 @@ static void cycx_reset_boot(void __iomem
/* 80186 was in hold, go */
writeb(0, addr + START_CPU);
- delay_cycx(1);
+ ssleep_interruptible(1);
}
/* Load data.bin file through boot (reset) interface. */
@@ -462,13 +461,13 @@ static int load_cyc2x(struct cycx_hw *hw
cycx_reset_boot(hw->dpmbase, reset_image, img_hdr->reset_size);
/* reset is waiting for boot */
writew(GEN_POWER_ON, pt_cycld);
- delay_cycx(1);
+ ssleep_interruptible(1);
for (j = 0 ; j < 3 ; j++)
if (!readw(pt_cycld))
goto reset_loaded;
else
- delay_cycx(1);
+ ssleep_interruptible(1);
}
printk(KERN_ERR "%s: reset not started.\n", modname);
@@ -495,7 +494,7 @@ reset_loaded:
/* Arthur Ganzert's tip: wait a while after the firmware loading...
seg abr 26 17:17:12 EST 1999 - acme */
- delay_cycx(7);
+ ssleep_interruptible(7);
printk(KERN_INFO "%s: firmware loaded!\n", modname);
/* enable interrupts */
@@ -547,20 +546,13 @@ static int get_option_index(long *optlis
static int reset_cyc2x(void __iomem *addr)
{
writeb(0, addr + RST_ENABLE);
- delay_cycx(2);
+ ssleep_interruptible(2);
writeb(0, addr + RST_DISABLE);
- delay_cycx(2);
+ ssleep_interruptible(2);
return memory_exists(addr);
}
-/* Delay */
-static void delay_cycx(int sec)
-{
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(sec * HZ);
-}
-
/* Calculate 16-bit CRC using CCITT polynomial. */
static u16 checksum(u8 *buf, u32 len)
{
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2004-11-01 19:48 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:43 [patch 13/18] net/cycx_drv: replace delay_cycx() with msleep_interruptible() janitor
2004-10-31 11:04 ` Jeff Garzik
2004-11-01 19:48 ` [PATCH] net/cycx_drv: replace delay_cycx() 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).