From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nishanth Aravamudan Date: Tue, 01 Feb 2005 19:51:36 +0000 Subject: [KJ] [UPDATE PATCH 37/39] usb/mdc800: use wait_event_timeout() Message-Id: <20050201195136.GC2575@us.ibm.com> MIME-Version: 1 Content-Type: multipart/mixed; boundary="===============13687758555894991==" List-Id: To: kernel-janitors@vger.kernel.org --===============13687758555894991== Content-Type: text/plain; charset=us-ascii Content-Disposition: inline On Mon, Jan 31, 2005 at 10:58:02AM -0800, Greg KH wrote: > On Fri, Jan 21, 2005 at 01:37:39PM -0800, Nishanth Aravamudan wrote: > > Hi, > > > > Please consider applying. > > > > Description: Use wait_event_timeout() instead of custom wait-queue code. Remove > > now unused variables. > > > > Signed-off-by: Nishanth Aravamudan > > Applied, thanks. Greg, This should fix the behavior of the previous patch (probably not noticed yet). The wake_up*() was not matched properly in the first patch (fixed below). Please consider reverting the previous patch and applying this one instead. I think it may actually have been somewhat broken in the original code, actually :) Thanks, Nish Description: Use wait_event_timeout() instead of custom wait-queue code. Remove now unused variables. Thus, the wake_up*() calls were modified to match the wait_event*() ones. There were some naming conflicts, which I tried to resolve appropriately. Patch is compile-tested. Signed-off-by: Nishanth Aravamudan --- 2.6.11-rc2-kj-v/drivers/usb/image/mdc800.c 2005-02-01 11:46:22.000000000 -0800 +++ 2.6.11-rc2-kj/drivers/usb/image/mdc800.c 2005-02-01 11:49:37.000000000 -0800 @@ -95,6 +95,7 @@ #include #include #include +#include #include #include @@ -330,7 +331,7 @@ static void mdc800_usb_irq (struct urb * { mdc800->camera_request_ready=0; mdc800->irq_woken=1; - wake_up_interruptible (&mdc800->irq_wait); + wake_up (&mdc800->irq_wait); } } @@ -346,19 +347,9 @@ static void mdc800_usb_irq (struct urb * */ static int mdc800_usb_waitForIRQ (int mode, int msec) { - DECLARE_WAITQUEUE(wait, current); - long timeout; - mdc800->camera_request_ready=1+mode; - add_wait_queue(&mdc800->irq_wait, &wait); - timeout = msec*HZ/1000; - while (!mdc800->irq_woken && timeout) - { - set_current_state(TASK_UNINTERRUPTIBLE); - timeout = schedule_timeout (timeout); - } - remove_wait_queue(&mdc800->irq_wait, &wait); + wait_event_timeout(mdc800->irq_wait, mdc800->irq_woken, msec*HZ/1000); mdc800->irq_woken = 0; if (mdc800->camera_request_ready>0) @@ -395,7 +386,7 @@ static void mdc800_usb_write_notify (str mdc800->state=READY; } mdc800->written = 1; - wake_up_interruptible (&mdc800->write_wait); + wake_up (&mdc800->write_wait); } @@ -423,7 +414,7 @@ static void mdc800_usb_download_notify ( err ("request bytes fails (status:%i)", urb->status); } mdc800->downloaded = 1; - wake_up_interruptible (&mdc800->download_wait); + wake_up (&mdc800->download_wait); } @@ -704,8 +695,6 @@ static ssize_t mdc800_device_read (struc { size_t left=len, sts=len; /* single transfer size */ char __user *ptr = buf; - long timeout; - DECLARE_WAITQUEUE(wait, current); down (&mdc800->io_lock); if (mdc800->state == NOT_CONNECTED) @@ -751,14 +740,8 @@ static ssize_t mdc800_device_read (struc up (&mdc800->io_lock); return len-left; } - add_wait_queue(&mdc800->download_wait, &wait); - timeout = TO_DOWNLOAD_GET_READY*HZ/1000; - while (!mdc800->downloaded && timeout) - { - set_current_state(TASK_UNINTERRUPTIBLE); - timeout = schedule_timeout (timeout); - } - remove_wait_queue(&mdc800->download_wait, &wait); + wait_event_timeout(mdc800->download_wait, mdc800->downloaded, + TO_DOWNLOAD_GET_READY*HZ/1000); mdc800->downloaded = 0; if (mdc800->download_urb->status != 0) { @@ -802,7 +785,6 @@ static ssize_t mdc800_device_read (struc static ssize_t mdc800_device_write (struct file *file, const char __user *buf, size_t len, loff_t *pos) { size_t i=0; - DECLARE_WAITQUEUE(wait, current); down (&mdc800->io_lock); if (mdc800->state != READY) @@ -856,7 +838,6 @@ static ssize_t mdc800_device_write (stru if (mdc800->in_count == 8) { int answersize; - long timeout; if (mdc800_usb_waitForIRQ (0,TO_GET_READY)) { @@ -876,14 +857,7 @@ static ssize_t mdc800_device_write (stru up (&mdc800->io_lock); return -EIO; } - add_wait_queue(&mdc800->write_wait, &wait); - timeout = TO_WRITE_GET_READY*HZ/1000; - while (!mdc800->written && timeout) - { - set_current_state(TASK_UNINTERRUPTIBLE); - timeout = schedule_timeout (timeout); - } - remove_wait_queue(&mdc800->write_wait, &wait); + wait_event_timeout(mdc800->write_wait, mdc800->written, TO_WRITE_GET_READY*HZ/1000); mdc800->written = 0; if (mdc800->state == WORKING) { --===============13687758555894991== 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 --===============13687758555894991==--