[PATCH 1/7] Char: rocket, switch long delay to sleep

!MAILaRCHIVE_VOTE_RePLACE
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
To: Andrew Morton <akpm@...>
Cc: <linux-kernel@...>
Date: Friday, November 9, 2007 - 7:34 pm

rocket, switch long delay to sleep

Don't busy wait for whole 1s when registering some rocket modems. Sleep
instead since we are not in atomic.

Signed-off-by: Jiri Slaby <jirislaby@gmail.com>

---
commit a9b06d9c7a580246dc328e96f31039d932bca47c
tree eb2e25299ebce29c89efa19c3014d41f742454c0
parent 5b07d82896b4d783e76f82dab6c4ba162545e414
author Jiri Slaby <jirislaby@gmail.com> Sat, 20 Oct 2007 11:51:04 +0200
committer Jiri Slaby <jirislaby@gmail.com> Fri, 09 Nov 2007 22:21:49 +0100

 drivers/char/rocket.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/char/rocket.c b/drivers/char/rocket.c
index d83419c..7a63f57 100644
--- a/drivers/char/rocket.c
+++ b/drivers/char/rocket.c
@@ -2191,10 +2191,10 @@ static __init int register_PCI(int i, struct pci_dev *dev)
 		num_chan = ports_per_aiop;
 		for (chan = 0; chan < num_chan; chan++)
 			sPCIModemReset(ctlp, chan, 1);
-		mdelay(500);
+		msleep(500);
 		for (chan = 0; chan < num_chan; chan++)
 			sPCIModemReset(ctlp, chan, 0);
-		mdelay(500);
+		msleep(500);
 		rmSpeakerReset(ctlp, rocketModel[i].model);
 	}
 	return (1);
@@ -2309,10 +2309,10 @@ static int __init init_ISA(int i)
 		total_num_chan = num_chan;
 		for (chan = 0; chan < num_chan; chan++)
 			sModemReset(ctlp, chan, 1);
-		mdelay(500);
+		msleep(500);
 		for (chan = 0; chan < num_chan; chan++)
 			sModemReset(ctlp, chan, 0);
-		mdelay(500);
+		msleep(500);
 		strcpy(rocketModel[i].modelString, "RocketModem ISA");
 	} else {
 		strcpy(rocketModel[i].modelString, "RocketPort ISA");
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[PATCH 1/7] Char: rocket, switch long delay to sleep, Jiri Slaby, (Fri Nov 9, 7:34 pm)
[PATCH 6/7] Char: stallion, fix compiler warnings, Jiri Slaby, (Fri Nov 9, 7:38 pm)
[PATCH 5/7] Char: mxser_new, ioaddresses are ulong, Jiri Slaby, (Fri Nov 9, 7:37 pm)
[PATCH 3/7] Char: rocket, remove useless macros, Jiri Slaby, (Fri Nov 9, 7:36 pm)
[PATCH 2/7] Char: rocket, printk cleanup, Jiri Slaby, (Fri Nov 9, 7:35 pm)
Re: [PATCH 2/7] Char: rocket, printk cleanup, Alan Cox, (Fri Nov 9, 7:41 pm)