From: Marcin Slusarz <marcin.slusarz@gmail.com>
To: kernel-janitors@vger.kernel.org
Subject: [KJ] [PATCH 16/21] polling loops: change exit condition to
Date: Sun, 04 Dec 2005 00:21:44 +0000 [thread overview]
Message-ID: <43923698.5080003@gmail.com> (raw)
PCMCIA SUBSYSTEM
P: Linux PCMCIA Team
L: http://lists.infradead.org/mailman/listinfo/linux-pcmcia
Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com>
diff -upr -X linux-2.6.15-rc4/Documentation/dontdiff linux-2.6.15-rc4-orig/drivers/pcmcia/cs.c linux-2.6.15-rc4/drivers/pcmcia/cs.c
--- linux-2.6.15-rc4-orig/drivers/pcmcia/cs.c 2005-12-03 15:22:33.000000000 +0100
+++ linux-2.6.15-rc4/drivers/pcmcia/cs.c 2005-12-03 16:53:10.000000000 +0100
@@ -396,7 +396,8 @@ static void socket_shutdown(struct pcmci
static int socket_reset(struct pcmcia_socket *skt)
{
- int status, i;
+ int status;
+ unsigned long end_time;
cs_dbg(skt, 4, "reset\n");
@@ -408,7 +409,8 @@ static int socket_reset(struct pcmcia_so
skt->ops->set_socket(skt, &skt->socket);
msleep(unreset_delay * 10);
- for (i = 0; i < unreset_limit; i++) {
+ end_time = jiffies + msecs_to_jiffies(unreset_limit * unreset_check * 10);
+ while (time_before(jiffies, end_time)) {
skt->ops->get_status(skt, &status);
if (!(status & SS_DETECT))
@@ -426,7 +428,8 @@ static int socket_reset(struct pcmcia_so
static int socket_setup(struct pcmcia_socket *skt, int initial_delay)
{
- int status, i;
+ int status;
+ unsigned long end_time;
cs_dbg(skt, 4, "setup\n");
@@ -436,7 +439,8 @@ static int socket_setup(struct pcmcia_so
msleep(initial_delay * 10);
- for (i = 0; i < 100; i++) {
+ end_time = jiffies + msecs_to_jiffies(10000);
+ while (time_before(jiffies, end_time)) {
skt->ops->get_status(skt, &status);
if (!(status & SS_DETECT))
return CS_NO_CARD;
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors
reply other threads:[~2005-12-04 0:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=43923698.5080003@gmail.com \
--to=marcin.slusarz@gmail.com \
--cc=kernel-janitors@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.