]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
USB: image: use msecs_to_jiffies for time conversion
authorNicholas Mc Guire <hofrat@osadl.org>
Fri, 6 Feb 2015 09:50:21 +0000 (04:50 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 18 Mar 2015 15:20:34 +0000 (16:20 +0100)
This is only an API consolidation and should make things more readable
it replaces var * HZ / 1000 by msecs_to_jiffies(var).

Signed-off-by: Nicholas Mc Guire <hofrat@osadl.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/image/mdc800.c

index a62865af53ccca76e9c123a2075d40d8c7961ce9..5cf2633cdb0471678da917bcccf91272c1300e42 100644 (file)
@@ -347,7 +347,8 @@ static int mdc800_usb_waitForIRQ (int mode, int msec)
 {
        mdc800->camera_request_ready=1+mode;
 
-       wait_event_timeout(mdc800->irq_wait, mdc800->irq_woken, msec*HZ/1000);
+       wait_event_timeout(mdc800->irq_wait, mdc800->irq_woken,
+                          msecs_to_jiffies(msec));
        mdc800->irq_woken = 0;
 
        if (mdc800->camera_request_ready>0)
@@ -743,8 +744,9 @@ static ssize_t mdc800_device_read (struct file *file, char __user *buf, size_t l
                                        mutex_unlock(&mdc800->io_lock);
                                        return len-left;
                                }
-                               wait_event_timeout(mdc800->download_wait, mdc800->downloaded,
-                                                                               TO_DOWNLOAD_GET_READY*HZ/1000);
+                               wait_event_timeout(mdc800->download_wait,
+                                    mdc800->downloaded,
+                                    msecs_to_jiffies(TO_DOWNLOAD_GET_READY));
                                mdc800->downloaded = 0;
                                if (mdc800->download_urb->status != 0)
                                {
@@ -867,7 +869,8 @@ static ssize_t mdc800_device_write (struct file *file, const char __user *buf, s
                                mutex_unlock(&mdc800->io_lock);
                                return -EIO;
                        }
-                       wait_event_timeout(mdc800->write_wait, mdc800->written, TO_WRITE_GET_READY*HZ/1000);
+                       wait_event_timeout(mdc800->write_wait, mdc800->written,
+                                       msecs_to_jiffies(TO_WRITE_GET_READY));
                        mdc800->written = 0;
                        if (mdc800->state == WORKING)
                        {