net/cycx_drv: replace delay_cycx() with msleep_interruptible()

PATCH Applied [email protected] 3 participants 3 messages Mar 6, 2005 – Mar 9, 2005

Subsystems (2)

Networking Network drivers

lore

Share & tools

lore

[email protected]

author

2005-03-06 10:32 UTC #0 lore raw

PATCH 7/26 net/cycx_drv: replace delay_cycx() with msleep_interruptible()

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 <[email protected]>

Acked-by Arnaldo Carvalho de Melo <[email protected]>

Signed-off-by Maximilian Attems <[email protected]>

Signed-off-by Domen Puncer <[email protected]>

---

 kj-domen/drivers/net/wan/cycx_drv.c |   24 ++++++++----------------
 1 files changed, 8 insertions(+), 16 deletions(-)

drivers/net/wan/cycx_drv.c renamed from drivers/net/wan/cycx_drv.c~msleep_interruptible-drivers_net_wan_cycx_drv +8 ~~-16~~

diff -puN drivers/net/wan/cycx_drv.c~msleep_interruptible-drivers_net_wan_cycx_drv drivers/net/wan/cycx_drv.c
@@ -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)
 {

Jeff Garzik

2005-03-09 20:26 UTC #1 lore raw

Quoted 35 lines · [email protected] wrote:

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 <[email protected]>
Acked-by Arnaldo Carvalho de Melo <[email protected]>
Signed-off-by Maximilian Attems <[email protected]>
Signed-off-by Domen Puncer <[email protected]>
---
 kj-domen/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
drivers/net/wan/cycx_drv.c renamed from drivers/net/wan/cycx_drv.c~msleep_interruptible-drivers_net_wan_cycx_drv +1 -2
@@ -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);
 

drivers/net/wan/cycx_drv.c static int memory_exists(void __iomem *a · line 261

Quoted 5 lines

drivers/net/wan/cycx_drv.c renamed from drivers/net/wan/cycx_drv.c~msleep_interruptible-drivers_net_wan_cycx_drv +1 -1
@@ -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);

use ssleep_interruptible

Nishanth Aravamudan

2005-03-09 21:18 UTC #2 lore raw

Quoted 39 lines · Jeff Garzik

Quoted 38 lines · [email protected] wrote:
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 <[email protected]>
Acked-by Arnaldo Carvalho de Melo <[email protected]>
Signed-off-by Maximilian Attems <[email protected]>
Signed-off-by Domen Puncer <[email protected]>
---
kj-domen/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
---
kj/drivers/net/wan/cycx_drv.c~msleep_interruptible-drivers_net_wan_cycx_drv 2005-03-05 16:09:34.000000000 +0100
+++ kj-domen/drivers/net/wan/cycx_drv.c 2005-03-05
16:09:34.000000000 +0100
drivers/net/wan/cycx_drv.c renamed from drivers/net/wan/cycx_drv.c~msleep_interruptible-drivers_net_wan_cycx_drv +1 -2
@@ -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);
 

Quoted 8 lines

drivers/net/wan/cycx_drv.c static int memory_exists(void __iomem *a · line 261
Quoted 6 lines
drivers/net/wan/cycx_drv.c renamed from drivers/net/wan/cycx_drv.c~msleep_interruptible-drivers_net_wan_cycx_drv +1 -1
@@ -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);
use ssleep_interruptible

ssleep_interruptible() doesn't exist; there was much discussion of whether it should, but then we ran into issues of:

ssleep_interruptible(1) -> msleep_interruptible(1000), which returns, say, 452, i.e. 452 milliseconds left in sleep. Should ssleep_interruptible() return 452 and thus take seconds as a parameter and milliseconds as a return value or should it return 0? or 1? It was all to confusing for me :)

Thanks,
Nish