[3/14] Orinoco driver updates - use mdelay()/ssleep() more

[David Gibson]

Use mdelay() or ssleep() instead of various silly more complicated
ways of delaying in the orinoco driver.

Signed-off-by: David Gibson <[EMAIL PROTECTED]>

Index: working-2.6/drivers/net/wireless/orinoco_pci.c
===
--- working-2.6.orig/drivers/net/wireless/orinoco_pci.c 2005-01-12 
15:13:18.819073992 +1100
+++ working-2.6/drivers/net/wireless/orinoco_pci.c  2005-01-12 
15:15:33.137654464 +1100
@@ -151,19 +151,11 @@
 
/* Assert the reset until the card notice */
hermes_write_regn(hw, PCI_COR, HERMES_PCI_COR_MASK);
-   timeout = jiffies + (HERMES_PCI_COR_ONT * HZ / 1000);
-   while(time_before(jiffies, timeout)) {
-   mdelay(1);
-   }
-   //mdelay(HERMES_PCI_COR_ONT);
+   mdelay(HERMES_PCI_COR_ONT);
 
/* Give time for the card to recover from this hard effort */
hermes_write_regn(hw, PCI_COR, 0x);
-   timeout = jiffies + (HERMES_PCI_COR_OFFT * HZ / 1000);
-   while(time_before(jiffies, timeout)) {
-   mdelay(1);
-   }
-   //mdelay(HERMES_PCI_COR_OFFT);
+   mdelay(HERMES_PCI_COR_OFFT);
 
/* The card is ready when it's no longer busy */
timeout = jiffies + (HERMES_PCI_COR_BUSYT * HZ / 1000);
Index: working-2.6/drivers/net/wireless/orinoco_plx.c
===
--- working-2.6.orig/drivers/net/wireless/orinoco_plx.c 2005-01-12 
15:13:18.821073688 +1100
+++ working-2.6/drivers/net/wireless/orinoco_plx.c  2005-01-12 
15:15:33.138654312 +1100
@@ -356,8 +356,7 @@
 static void __exit orinoco_plx_exit(void)
 {
pci_unregister_driver(_plx_driver);
-   current->state = TASK_UNINTERRUPTIBLE;
-   schedule_timeout(HZ);
+   ssleep(1);
 }
 
 module_init(orinoco_plx_init);
Index: working-2.6/drivers/net/wireless/orinoco_tmd.c
===
--- working-2.6.orig/drivers/net/wireless/orinoco_tmd.c 2005-01-12 
15:13:18.820073840 +1100
+++ working-2.6/drivers/net/wireless/orinoco_tmd.c  2005-01-12 
15:16:05.897674184 +1100
@@ -225,8 +225,7 @@
 static void __exit orinoco_tmd_exit(void)
 {
pci_unregister_driver(_tmd_driver);
-   current->state = TASK_UNINTERRUPTIBLE;
-   schedule_timeout(HZ);
+   ssleep(1);
 }
 
 module_init(orinoco_tmd_init);


-- 
David Gibson| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au  | minimalist.  NOT _the_ _other_ _way_
| _around_!
http://www.ozlabs.org/people/dgibson
-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

[3/14] Orinoco driver updates - use mdelay()/ssleep() more

[David Gibson]

Use mdelay() or ssleep() instead of various silly more complicated
ways of delaying in the orinoco driver.

Signed-off-by: David Gibson [EMAIL PROTECTED]

Index: working-2.6/drivers/net/wireless/orinoco_pci.c
===
--- working-2.6.orig/drivers/net/wireless/orinoco_pci.c 2005-01-12 
15:13:18.819073992 +1100
+++ working-2.6/drivers/net/wireless/orinoco_pci.c  2005-01-12 
15:15:33.137654464 +1100
@@ -151,19 +151,11 @@
 
/* Assert the reset until the card notice */
hermes_write_regn(hw, PCI_COR, HERMES_PCI_COR_MASK);
-   timeout = jiffies + (HERMES_PCI_COR_ONT * HZ / 1000);
-   while(time_before(jiffies, timeout)) {
-   mdelay(1);
-   }
-   //mdelay(HERMES_PCI_COR_ONT);
+   mdelay(HERMES_PCI_COR_ONT);
 
/* Give time for the card to recover from this hard effort */
hermes_write_regn(hw, PCI_COR, 0x);
-   timeout = jiffies + (HERMES_PCI_COR_OFFT * HZ / 1000);
-   while(time_before(jiffies, timeout)) {
-   mdelay(1);
-   }
-   //mdelay(HERMES_PCI_COR_OFFT);
+   mdelay(HERMES_PCI_COR_OFFT);
 
/* The card is ready when it's no longer busy */
timeout = jiffies + (HERMES_PCI_COR_BUSYT * HZ / 1000);
Index: working-2.6/drivers/net/wireless/orinoco_plx.c
===
--- working-2.6.orig/drivers/net/wireless/orinoco_plx.c 2005-01-12 
15:13:18.821073688 +1100
+++ working-2.6/drivers/net/wireless/orinoco_plx.c  2005-01-12 
15:15:33.138654312 +1100
@@ -356,8 +356,7 @@
 static void __exit orinoco_plx_exit(void)
 {
pci_unregister_driver(orinoco_plx_driver);
-   current-state = TASK_UNINTERRUPTIBLE;
-   schedule_timeout(HZ);
+   ssleep(1);
 }
 
 module_init(orinoco_plx_init);
Index: working-2.6/drivers/net/wireless/orinoco_tmd.c
===
--- working-2.6.orig/drivers/net/wireless/orinoco_tmd.c 2005-01-12 
15:13:18.820073840 +1100
+++ working-2.6/drivers/net/wireless/orinoco_tmd.c  2005-01-12 
15:16:05.897674184 +1100
@@ -225,8 +225,7 @@
 static void __exit orinoco_tmd_exit(void)
 {
pci_unregister_driver(orinoco_tmd_driver);
-   current-state = TASK_UNINTERRUPTIBLE;
-   schedule_timeout(HZ);
+   ssleep(1);
 }
 
 module_init(orinoco_tmd_init);


-- 
David Gibson| I'll have my music baroque, and my code
david AT gibson.dropbear.id.au  | minimalist.  NOT _the_ _other_ _way_
| _around_!
http://www.ozlabs.org/people/dgibson
-
To unsubscribe from this list: send the line unsubscribe linux-kernel in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/