Skip to contentSkip to conversation

pcmcia/cs: replace schedule_timeout() with msleep()

PATCH New [email protected] 1 participant 1 message Sep 23, 2004 Pcmcia

lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH 2/5 pcmcia/cs: replace schedule_timeout() with msleep()

I would appreciate any comments from the janitor@sternweltens list.

Description: Remove unnecessary cs_to_timeout() macro. Use msleep() instead of schedule_timeout() to guarantee the task delays for the desired time.

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

---

 linux-2.6.9-rc2-bk7-max/drivers/pcmcia/cs.c |   26 ++++++++------------------
 1 files changed, 8 insertions(+), 18 deletions(-)
drivers/pcmcia/cs.c renamed from drivers/pcmcia/cs.c~msleep-drivers_pcmcia_cs +8 -18
diff -puN drivers/pcmcia/cs.c~msleep-drivers_pcmcia_cs drivers/pcmcia/cs.c
@@ -427,8 +427,6 @@ static int send_event(struct pcmcia_sock
     return ret;
 } /* send_event */
 
-#define cs_to_timeout(cs) (((cs) * HZ + 99) / 100)
-
 static void socket_remove_drivers(struct pcmcia_socket *skt)
 {
 	client_t *client;

@@ -448,8 +446,7 @@ static void socket_shutdown(struct pcmci
 
 	socket_remove_drivers(skt);
 	skt->state &= SOCKET_INUSE|SOCKET_PRESENT;
-	set_current_state(TASK_UNINTERRUPTIBLE);
-	schedule_timeout(cs_to_timeout(shutdown_delay));
+	msleep(shutdown_delay * 10);
 	skt->state &= SOCKET_INUSE;
 	shutdown_socket(skt);
 }

@@ -467,8 +464,7 @@ static int socket_reset(struct pcmcia_so
 	skt->socket.flags &= ~SS_RESET;
 	skt->ops->set_socket(skt, &skt->socket);
 
-	set_current_state(TASK_UNINTERRUPTIBLE);
-	schedule_timeout(cs_to_timeout(unreset_delay));
+	msleep(unreset_delay * 10);
 	for (i = 0; i < unreset_limit; i++) {
 		skt->ops->get_status(skt, &status);
 

@@ -478,8 +474,7 @@ static int socket_reset(struct pcmcia_so
 		if (status & SS_READY)
 			return CS_SUCCESS;
 
-		set_current_state(TASK_UNINTERRUPTIBLE);
-		schedule_timeout(cs_to_timeout(unreset_check));
+		msleep(unreset_check * 10);
 	}
 
 	cs_err(skt, "time out after reset.\n");

@@ -496,8 +491,7 @@ static int socket_setup(struct pcmcia_so
 	if (!(status & SS_DETECT))
 		return CS_NO_CARD;
 
-	set_current_state(TASK_UNINTERRUPTIBLE);
-	schedule_timeout(cs_to_timeout(initial_delay));
+	msleep(initial_delay * 10);
 
 	for (i = 0; i < 100; i++) {
 		skt->ops->get_status(skt, &status);

@@ -507,8 +501,7 @@ static int socket_setup(struct pcmcia_so
 		if (!(status & SS_PENDING))
 			break;
 
-		set_current_state(TASK_UNINTERRUPTIBLE);
-		schedule_timeout(cs_to_timeout(10));
+		msleep(100);
 	}
 
 	if (status & SS_PENDING) {

@@ -541,8 +534,7 @@ static int socket_setup(struct pcmcia_so
 	/*
 	 * Wait "vcc_settle" for the supply to stabilise.
 	 */
-	set_current_state(TASK_UNINTERRUPTIBLE);
-	schedule_timeout(cs_to_timeout(vcc_settle));
+	msleep(vcc_settle * 10);
 
 	skt->ops->get_status(skt, &status);
 	if (!(status & SS_POWERON)) {

@@ -659,10 +651,8 @@ static void socket_detect_change(struct 
 	if (!(skt->state & SOCKET_SUSPEND)) {
 		int status;
 
-		if (!(skt->state & SOCKET_PRESENT)) {
-			set_current_state(TASK_UNINTERRUPTIBLE);
-			schedule_timeout(cs_to_timeout(2));
-		}
+		if (!(skt->state & SOCKET_PRESENT))
+			msleep(20);
 
 		skt->ops->get_status(skt, &status);
 		if ((skt->state & SOCKET_PRESENT) &&

_