[media] si4713: coding style time-related cleanups
authorHans Verkuil <hans.verkuil@cisco.com>
Fri, 6 Dec 2013 09:48:49 +0000 (06:48 -0300)
committerMauro Carvalho Chehab <m.chehab@samsung.com>
Wed, 18 Dec 2013 08:41:22 +0000 (06:41 -0200)
Fix the non-whitespace checkpatch errors/warnings.
Replace msleep with usleep_range and the jiffies comparison with
time_is_after_jiffies().

Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Acked-by: Eduardo Valentin <edubezval@gmail.com>
Acked-by: Dinesh Ram <dinesh.ram@cern.ch>
Signed-off-by: Mauro Carvalho Chehab <m.chehab@samsung.com>
drivers/media/radio/si4713/si4713.c

index 4c3498f05030deb4dbba23a27d4b725a87bc29d0..07d5153811e88b4fc3c12c2136bb46ea35cc42e4 100644 (file)
@@ -252,8 +252,11 @@ static int si4713_send_command(struct si4713_device *sdev, const u8 command,
 
                if (client->irq)
                        return -EBUSY;
-               msleep(1);
-       } while (jiffies <= until_jiffies);
+               if (usecs <= 1000)
+                       usleep_range(usecs, 1000);
+               else
+                       usleep_range(1000, 2000);
+       } while (time_is_after_jiffies(until_jiffies));
 
        return -EBUSY;
 }
@@ -505,11 +508,11 @@ static int si4713_wait_stc(struct si4713_device *sdev, const int usecs)
                }
                if (jiffies_to_usecs(jiffies - start_jiffies) > usecs)
                        return err < 0 ? err : -EIO;
-               /* We sleep here for 3 ms in order to avoid flooding the device
+               /* We sleep here for 3-4 ms in order to avoid flooding the device
                 * with USB requests. The si4713 USB driver was developed
                 * by reverse engineering the Windows USB driver. The windows
                 * driver also has a ~2.5 ms delay between responses. */
-               msleep(3);
+               usleep_range(3000, 4000);
        }
 }