git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
linux 2.6.16.38 w/ vs2.0.3-rc1
[linux-2.6.git]
/
drivers
/
media
/
radio
/
radio-zoltrix.c
diff --git
a/drivers/media/radio/radio-zoltrix.c
b/drivers/media/radio/radio-zoltrix.c
index
7bf1a42
..
d590e80
100644
(file)
--- a/
drivers/media/radio/radio-zoltrix.c
+++ b/
drivers/media/radio/radio-zoltrix.c
@@
-48,7
+48,7
@@
struct zol_device {
unsigned long curfreq;
int muted;
unsigned int stereo;
unsigned long curfreq;
int muted;
unsigned int stereo;
- struct
mutex
lock;
+ struct
semaphore
lock;
};
static int zol_setvol(struct zol_device *dev, int vol)
};
static int zol_setvol(struct zol_device *dev, int vol)
@@
-57,30
+57,30
@@
static int zol_setvol(struct zol_device *dev, int vol)
if (dev->muted)
return 0;
if (dev->muted)
return 0;
-
mutex_lock
(&dev->lock);
+
down
(&dev->lock);
if (vol == 0) {
outb(0, io);
outb(0, io);
inb(io + 3); /* Zoltrix needs to be read to confirm */
if (vol == 0) {
outb(0, io);
outb(0, io);
inb(io + 3); /* Zoltrix needs to be read to confirm */
-
mutex_unlock
(&dev->lock);
+
up
(&dev->lock);
return 0;
}
outb(dev->curvol-1, io);
msleep(10);
inb(io + 2);
return 0;
}
outb(dev->curvol-1, io);
msleep(10);
inb(io + 2);
-
mutex_unlock
(&dev->lock);
+
up
(&dev->lock);
return 0;
}
static void zol_mute(struct zol_device *dev)
{
dev->muted = 1;
return 0;
}
static void zol_mute(struct zol_device *dev)
{
dev->muted = 1;
-
mutex_lock
(&dev->lock);
+
down
(&dev->lock);
outb(0, io);
outb(0, io);
inb(io + 3); /* Zoltrix needs to be read to confirm */
outb(0, io);
outb(0, io);
inb(io + 3); /* Zoltrix needs to be read to confirm */
-
mutex_unlock
(&dev->lock);
+
up
(&dev->lock);
}
static void zol_unmute(struct zol_device *dev)
}
static void zol_unmute(struct zol_device *dev)
@@
-104,7
+104,7
@@
static int zol_setfreq(struct zol_device *dev, unsigned long freq)
bitmask = 0xc480402c10080000ull;
i = 45;
bitmask = 0xc480402c10080000ull;
i = 45;
-
mutex_lock
(&dev->lock);
+
down
(&dev->lock);
outb(0, io);
outb(0, io);
outb(0, io);
outb(0, io);
@@
-149,7
+149,7
@@
static int zol_setfreq(struct zol_device *dev, unsigned long freq)
udelay(1000);
}
udelay(1000);
}
-
mutex_unlock
(&dev->lock);
+
up
(&dev->lock);
if(!dev->muted)
{
if(!dev->muted)
{
@@
-164,7
+164,7
@@
static int zol_getsigstr(struct zol_device *dev)
{
int a, b;
{
int a, b;
-
mutex_lock
(&dev->lock);
+
down
(&dev->lock);
outb(0x00, io); /* This stuff I found to do nothing */
outb(dev->curvol, io);
msleep(20);
outb(0x00, io); /* This stuff I found to do nothing */
outb(dev->curvol, io);
msleep(20);
@@
-173,7
+173,7
@@
static int zol_getsigstr(struct zol_device *dev)
msleep(10);
b = inb(io);
msleep(10);
b = inb(io);
-
mutex_unlock
(&dev->lock);
+
up
(&dev->lock);
if (a != b)
return (0);
if (a != b)
return (0);
@@
-188,7
+188,7
@@
static int zol_is_stereo (struct zol_device *dev)
{
int x1, x2;
{
int x1, x2;
-
mutex_lock
(&dev->lock);
+
down
(&dev->lock);
outb(0x00, io);
outb(dev->curvol, io);
outb(0x00, io);
outb(dev->curvol, io);
@@
-198,7
+198,7
@@
static int zol_is_stereo (struct zol_device *dev)
msleep(10);
x2 = inb(io);
msleep(10);
x2 = inb(io);
-
mutex_unlock
(&dev->lock);
+
up
(&dev->lock);
if ((x1 == x2) && (x1 == 0xcf))
return 1;
if ((x1 == x2) && (x1 == 0xcf))
return 1;
@@
-350,7
+350,7
@@
static int __init zoltrix_init(void)
}
printk(KERN_INFO "Zoltrix Radio Plus card driver.\n");
}
printk(KERN_INFO "Zoltrix Radio Plus card driver.\n");
-
mutex_init
(&zoltrix_unit.lock);
+
init_MUTEX
(&zoltrix_unit.lock);
/* mute card - prevents noisy bootups */
/* mute card - prevents noisy bootups */