ChangeSet 1.2065.3.41, 2005/03/12 08:31:44-08:00, [EMAIL PROTECTED]
[PATCH] media/radio-zoltrix: replace sleep_delay() with msleep()
Use msleep() instead of sleep_delay() so that the driver sleeps as the
comment
indicated. I assumed that two sleep_delay()s in a row indicated
sleeping for
20ms. Please let me know if this is incorrect.
Signed-off-by: Nishanth Aravamudan <[EMAIL PROTECTED]>
Signed-off-by: Maximilian Attems <[EMAIL PROTECTED]>
Signed-off-by: Domen Puncer <[EMAIL PROTECTED]>
Signed-off-by: Gerd Knorr <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
radio-zoltrix.c | 26 +++++++-------------------
1 files changed, 7 insertions(+), 19 deletions(-)
diff -Nru a/drivers/media/radio/radio-zoltrix.c
b/drivers/media/radio/radio-zoltrix.c
--- a/drivers/media/radio/radio-zoltrix.c 2005-03-12 21:33:19 -08:00
+++ b/drivers/media/radio/radio-zoltrix.c 2005-03-12 21:33:19 -08:00
@@ -29,7 +29,7 @@
#include <linux/module.h> /* Modules */
#include <linux/init.h> /* Initdata */
#include <linux/ioport.h> /* check_region, request_region */
-#include <linux/delay.h> /* udelay */
+#include <linux/delay.h> /* udelay, msleep */
#include <asm/io.h> /* outb, outb_p */
#include <asm/uaccess.h> /* copy to/from user */
#include <linux/videodev.h> /* kernel radio structs */
@@ -51,15 +51,6 @@
struct semaphore lock;
};
-
-/* local things */
-
-static void sleep_delay(void)
-{
- /* Sleep nicely for +/- 10 mS */
- schedule();
-}
-
static int zol_setvol(struct zol_device *dev, int vol)
{
dev->curvol = vol;
@@ -76,7 +67,7 @@
}
outb(dev->curvol-1, io);
- sleep_delay();
+ msleep(10);
inb(io + 2);
up(&dev->lock);
return 0;
@@ -176,11 +167,10 @@
down(&dev->lock);
outb(0x00, io); /* This stuff I found to do nothing */
outb(dev->curvol, io);
- sleep_delay();
- sleep_delay();
+ msleep(20);
a = inb(io);
- sleep_delay();
+ msleep(10);
b = inb(io);
up(&dev->lock);
@@ -202,11 +192,10 @@
outb(0x00, io);
outb(dev->curvol, io);
- sleep_delay();
- sleep_delay();
+ msleep(20);
x1 = inb(io);
- sleep_delay();
+ msleep(10);
x2 = inb(io);
up(&dev->lock);
@@ -368,8 +357,7 @@
outb(0, io);
outb(0, io);
- sleep_delay();
- sleep_delay();
+ msleep(20);
inb(io + 3);
zoltrix_unit.curvol = 0;
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
