From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nishanth Aravamudan Date: Wed, 21 Jul 2004 21:13:36 +0000 Subject: [Kernel-janitors] [PATCH] bluetooth: replace schedule_timeout() with Message-Id: <20040721211335.GF1906@us.ibm.com> MIME-Version: 1 Content-Type: multipart/mixed; boundary="===============54562303369388698==" List-Id: References: <20040720181806.GF2320@us.ibm.com> In-Reply-To: <20040720181806.GF2320@us.ibm.com> To: kernel-janitors@vger.kernel.org --===============54562303369388698== Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Please find below the corrected version, which compiles without error for me. I would appreciate any comments from the janitors list. This is one (of many) cases where I made a decision about replacing set_current_state(TASK_INTERRUPTIBLE); schedule_timeout(some_time); with msleep(jiffies_to_msecs(some_time)); msleep() is not exactly the same as the previous code, but I only did this replacement where I thought long delays were *desired*. If this is not the case here, then just disregard this patch. Thanks, Nish Applys-to: 2.6.7 Description: Uses msleep() instead of schedule_timeout() to guarantee the task delays at least the desired time amount. Signed-off-by: Nishanth Aravamudan --- linux-vanilla/drivers/bluetooth/bluecard_cs.c 2004-06-16 05:19:22.000000000 +0000 +++ linux-dev/drivers/bluetooth/bluecard_cs.c 2004-07-21 20:52:07.000000000 +0000 @@ -34,6 +34,7 @@ #include #include #include +#include #include #include @@ -776,8 +777,7 @@ int bluecard_open(bluecard_info_t *info) outb(0x80, iobase + 0x30); /* Wait some time */ - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(HZ / 100); + msleep(100); /* Turn FPGA on */ outb(0x00, iobase + 0x30); @@ -823,8 +823,7 @@ int bluecard_open(bluecard_info_t *info) outb((0x0f << RTS_LEVEL_SHIFT_BITS) | 1, iobase + REG_RX_CONTROL); /* Timeout before it is safe to send the first HCI packet */ - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout((HZ * 5) / 4); // or set it to 3/2 + msleep(1250); /* Register HCI device */ if (hci_register_dev(hdev) < 0) { --===============54562303369388698== Content-Type: text/plain; charset="iso-8859-1" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Disposition: inline _______________________________________________ Kernel-janitors mailing list Kernel-janitors@lists.osdl.org http://lists.osdl.org/mailman/listinfo/kernel-janitors --===============54562303369388698==--