9 files changed, 75 insertions, 72 deletions

diff --git a/drivers/media/radio/miropcm20-rds-core.c b/drivers/media/radio/miropcm20-rds-core.c
index a917a90cb5dc..b602c73e2309 100644
--- a/drivers/media/radio/miropcm20-rds-core.c
+++ b/drivers/media/radio/miropcm20-rds-core.c
@@ -18,14 +18,15 @@
 #include <linux/string.h>
 #include <linux/init.h>
 #include <linux/slab.h>
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
+
 #include <asm/io.h>
 #include "../../../sound/oss/aci.h"
 #include "miropcm20-rds-core.h"
 
 #define DEBUG 0
 
-static struct semaphore aci_rds_sem;
+static struct mutex aci_rds_mutex;
 
 #define RDS_DATASHIFT          2   /* Bit 2 */
 #define RDS_DATAMASK        (1 << RDS_DATASHIFT)
@@ -181,7 +182,7 @@ int aci_rds_cmd(unsigned char cmd, unsigned char databuffer[], int datasize)
 {
         int ret;
 
-        if (down_interruptible(&aci_rds_sem))
+        if (mutex_lock_interruptible(&aci_rds_mutex))
                 return -EINTR;
 
         rds_write(cmd);
@@ -192,7 +193,7 @@ int aci_rds_cmd(unsigned char cmd, unsigned char databuffer[], int datasize)
         else
                 ret = 0;
 
-        up(&aci_rds_sem);
+        mutex_unlock(&aci_rds_mutex);
         
         return ret;
 }
@@ -200,7 +201,7 @@ EXPORT_SYMBOL(aci_rds_cmd);
 
 int __init attach_aci_rds(void)
 {
-        init_MUTEX(&aci_rds_sem);
+        mutex_init(&aci_rds_mutex);
         return 0;
 }
 
diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c
index 914deab4e044..557fb5c4af38 100644
--- a/drivers/media/radio/radio-aimslab.c
+++ b/drivers/media/radio/radio-aimslab.c
@@ -43,7 +43,7 @@
 
 static int io = CONFIG_RADIO_RTRACK_PORT; 
 static int radio_nr = -1;
-static struct semaphore lock;
+static struct mutex lock;
 
 struct rt_device
 {
@@ -83,23 +83,23 @@ static void rt_incvol(void)
 static void rt_mute(struct rt_device *dev)
 {
         dev->muted = 1;
-        down(&lock);
+        mutex_lock(&lock);
         outb(0xd0, io);                 /* volume steady, off           */
-        up(&lock);
+        mutex_unlock(&lock);
 }
 
 static int rt_setvol(struct rt_device *dev, int vol)
 {
         int i;
 
-        down(&lock);
+        mutex_lock(&lock);
         
         if(vol == dev->curvol) {        /* requested volume = current */
                 if (dev->muted) {       /* user is unmuting the card  */
                         dev->muted = 0;
                         outb (0xd8, io);        /* enable card */
                 }       
-                up(&lock);
+                mutex_unlock(&lock);
                 return 0;
         }
 
@@ -108,7 +108,7 @@ static int rt_setvol(struct rt_device *dev, int vol)
                 sleep_delay(2000000);   /* make sure it's totally down  */
                 outb(0xd0, io);         /* volume steady, off           */
                 dev->curvol = 0;        /* track the volume state!      */
-                up(&lock);
+                mutex_unlock(&lock);
                 return 0;
         }
 
@@ -121,7 +121,7 @@ static int rt_setvol(struct rt_device *dev, int vol)
                         rt_decvol();
 
         dev->curvol = vol;
-        up(&lock);
+        mutex_unlock(&lock);
         return 0;
 }
 
@@ -168,7 +168,7 @@ static int rt_setfreq(struct rt_device *dev, unsigned long freq)
         freq += 171200;                 /* Add 10.7 MHz IF              */
         freq /= 800;                    /* Convert to 50 kHz units      */
         
-        down(&lock);                    /* Stop other ops interfering */
+        mutex_lock(&lock);                      /* Stop other ops interfering */
          
         send_0_byte (io, dev);          /*  0: LSB of frequency         */
 
@@ -196,7 +196,7 @@ static int rt_setfreq(struct rt_device *dev, unsigned long freq)
         else
                 outb (0xd8, io);        /* volume steady + sigstr + on */
                 
-        up(&lock);
+        mutex_unlock(&lock);
 
         return 0;
 }
@@ -337,7 +337,7 @@ static int __init rtrack_init(void)
 
         /* Set up the I/O locking */
         
-        init_MUTEX(&lock);
+        mutex_init(&lock);
         
         /* mute card - prevents noisy bootups */
 
diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c
index 523be820f9c6..83bdae23417d 100644
--- a/drivers/media/radio/radio-aztech.c
+++ b/drivers/media/radio/radio-aztech.c
@@ -42,7 +42,7 @@
 static int io = CONFIG_RADIO_AZTECH_PORT; 
 static int radio_nr = -1;
 static int radio_wait_time = 1000;
-static struct semaphore lock;
+static struct mutex lock;
 
 struct az_device
 {
@@ -87,9 +87,9 @@ static void send_1_byte (struct az_device *dev)
 
 static int az_setvol(struct az_device *dev, int vol)
 {
-        down(&lock);
+        mutex_lock(&lock);
         outb (volconvert(vol), io);
-        up(&lock);
+        mutex_unlock(&lock);
         return 0;
 }
 
@@ -122,7 +122,7 @@ static int az_setfreq(struct az_device *dev, unsigned long frequency)
         frequency += 171200;            /* Add 10.7 MHz IF              */
         frequency /= 800;               /* Convert to 50 kHz units      */
                                         
-        down(&lock);
+        mutex_lock(&lock);
         
         send_0_byte (dev);              /*  0: LSB of frequency       */
 
@@ -152,7 +152,7 @@ static int az_setfreq(struct az_device *dev, unsigned long frequency)
         udelay (radio_wait_time);
         outb_p(128+64+volconvert(dev->curvol), io);
         
-        up(&lock);
+        mutex_unlock(&lock);
 
         return 0;
 }
@@ -283,7 +283,7 @@ static int __init aztech_init(void)
                 return -EBUSY;
         }
 
-        init_MUTEX(&lock);
+        mutex_init(&lock);
         aztech_radio.priv=&aztech_unit;
         
         if(video_register_device(&aztech_radio, VFL_TYPE_RADIO, radio_nr)==-1)
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c
index 36c9f5bf8cdd..39c1d9118636 100644
--- a/drivers/media/radio/radio-maestro.c
+++ b/drivers/media/radio/radio-maestro.c
@@ -23,10 +23,11 @@
 #include <linux/sched.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
 #include <linux/pci.h>
 #include <linux/videodev.h>
 
+
 #define DRIVER_VERSION  "0.05"
 
 #define GPIO_DATA       0x60   /* port offset from ESS_IO_BASE */
@@ -104,7 +105,7 @@ struct radio_device {
                 muted,  /* VIDEO_AUDIO_MUTE */
                 stereo, /* VIDEO_TUNER_STEREO_ON */     
                 tuned;  /* signal strength (0 or 0xffff) */
-        struct  semaphore lock;
+        struct mutex lock;
 };
 
 static u32 radio_bits_get(struct radio_device *dev)
@@ -258,9 +259,9 @@ static int radio_ioctl(struct inode *inode, struct file *file,
         struct radio_device *card = video_get_drvdata(dev);
         int ret;
 
-        down(&card->lock);
+        mutex_lock(&card->lock);
         ret = video_usercopy(inode, file, cmd, arg, radio_function);
-        up(&card->lock);
+        mutex_unlock(&card->lock);
 
         return ret;
 }
@@ -311,7 +312,7 @@ static int __devinit maestro_probe(struct pci_dev *pdev,
         }
 
         radio_unit->io = pci_resource_start(pdev, 0) + GPIO_DATA;
-        init_MUTEX(&radio_unit->lock);
+        mutex_init(&radio_unit->lock);
 
         maestro_radio_inst = video_device_alloc();
         if (maestro_radio_inst == NULL) {
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index c975ddd86cd5..f0bf47bcb64c 100644
--- a/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@ -37,7 +37,8 @@
 #include <linux/sched.h>
 #include <asm/io.h>
 #include <asm/uaccess.h>
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
+
 #include <linux/pci.h>
 #include <linux/videodev.h>
 
@@ -101,7 +102,7 @@ static struct radio_device
                 
         unsigned long freq;
         
-        struct  semaphore lock;
+        struct mutex lock;
 } radio_unit = {0, 0, 0, 0, };
 
 
@@ -267,9 +268,9 @@ static int radio_ioctl(struct inode *inode, struct file *file,
         struct radio_device *card=dev->priv;
         int ret;
         
-        down(&card->lock);
+        mutex_lock(&card->lock);
         ret = video_usercopy(inode, file, cmd, arg, radio_function);
-        up(&card->lock);
+        mutex_unlock(&card->lock);
         return ret;
 }
 
@@ -290,7 +291,7 @@ static int __devinit maxiradio_init_one(struct pci_dev *pdev, const struct pci_d
                 goto err_out_free_region;
 
         radio_unit.io = pci_resource_start(pdev, 0);
-        init_MUTEX(&radio_unit.lock);
+        mutex_init(&radio_unit.lock);
         maxiradio_radio.priv = &radio_unit;
 
         if(video_register_device(&maxiradio_radio, VFL_TYPE_RADIO, radio_nr)==-1) {
diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index 0229f792a059..53073b424107 100644
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -24,7 +24,7 @@
 #include <linux/isapnp.h>
 #include <asm/io.h>             /* outb, outb_p                 */
 #include <asm/uaccess.h>        /* copy to/from user            */
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
 
 struct fmi_device
 {
@@ -37,7 +37,7 @@ struct fmi_device
 static int io = -1; 
 static int radio_nr = -1;
 static struct pnp_dev *dev = NULL;
-static struct semaphore lock;
+static struct mutex lock;
 
 /* freq is in 1/16 kHz to internal number, hw precision is 50 kHz */
 /* It is only useful to give freq in intervall of 800 (=0.05Mhz),
@@ -68,16 +68,16 @@ static void outbits(int bits, unsigned int data, int port)
 
 static inline void fmi_mute(int port)
 {
-        down(&lock);
+        mutex_lock(&lock);
         outb(0x00, port);
-        up(&lock);
+        mutex_unlock(&lock);
 }
 
 static inline void fmi_unmute(int port)
 {
-        down(&lock);
+        mutex_lock(&lock);
         outb(0x08, port);
-        up(&lock);
+        mutex_unlock(&lock);
 }
 
 static inline int fmi_setfreq(struct fmi_device *dev)
@@ -85,12 +85,12 @@ static inline int fmi_setfreq(struct fmi_device *dev)
         int myport = dev->port;
         unsigned long freq = dev->curfreq;
 
-        down(&lock);
+        mutex_lock(&lock);
 
         outbits(16, RSF16_ENCODE(freq), myport);
         outbits(8, 0xC0, myport);
         msleep(143);            /* was schedule_timeout(HZ/7) */
-        up(&lock);
+        mutex_unlock(&lock);
         if (dev->curvol) fmi_unmute(myport);
         return 0;
 }
@@ -102,7 +102,7 @@ static inline int fmi_getsigstr(struct fmi_device *dev)
         int myport = dev->port;
 
         
-        down(&lock);
+        mutex_lock(&lock);
         val = dev->curvol ? 0x08 : 0x00;        /* unmute/mute */
         outb(val, myport);
         outb(val | 0x10, myport);
@@ -110,7 +110,7 @@ static inline int fmi_getsigstr(struct fmi_device *dev)
         res = (int)inb(myport+1);
         outb(val, myport);
         
-        up(&lock);
+        mutex_unlock(&lock);
         return (res & 2) ? 0 : 0xFFFF;
 }
 
@@ -296,7 +296,7 @@ static int __init fmi_init(void)
         fmi_unit.flags = VIDEO_TUNER_LOW;
         fmi_radio.priv = &fmi_unit;
         
-        init_MUTEX(&lock);
+        mutex_init(&lock);
         
         if (video_register_device(&fmi_radio, VFL_TYPE_RADIO, radio_nr) == -1) {
                 release_region(io, 2);
diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c
index 099ffb3b9c71..bcebd8cb19ad 100644
--- a/drivers/media/radio/radio-sf16fmr2.c
+++ b/drivers/media/radio/radio-sf16fmr2.c
@@ -19,9 +19,9 @@
 #include <asm/io.h>             /* outb, outb_p                 */
 #include <asm/uaccess.h>        /* copy to/from user            */
 #include <linux/videodev.h>     /* kernel radio structs         */
-#include <asm/semaphore.h>
+#include <linux/mutex.h>
 
-static struct semaphore lock;
+static struct mutex lock;
 
 #undef DEBUG
 //#define DEBUG 1
@@ -238,9 +238,9 @@ static int fmr2_do_ioctl(struct inode *inode, struct file *file,
                         if (fmr2->mute)
                                 v->flags |= VIDEO_AUDIO_MUTE;
                         v->mode=VIDEO_MODE_AUTO;
-                        down(&lock);
+                        mutex_lock(&lock);
                         v->signal = fmr2_getsigstr(fmr2);
-                        up(&lock);
+                        mutex_unlock(&lock);
                         return 0;
                 }
                 case VIDIOCSTUNER:
@@ -274,9 +274,9 @@ static int fmr2_do_ioctl(struct inode *inode, struct file *file,
                         /* set card freq (if not muted) */
                         if (fmr2->curvol && !fmr2->mute)
                         {
-                                down(&lock);
+                                mutex_lock(&lock);
                                 fmr2_setfreq(fmr2);
-                                up(&lock);
+                                mutex_unlock(&lock);
                         }
                         return 0;
                 }
@@ -318,14 +318,14 @@ static int fmr2_do_ioctl(struct inode *inode, struct file *file,
                         else
                                 printk(KERN_DEBUG "mute\n");
 #endif
-                        down(&lock);
+                        mutex_lock(&lock);
                         if (fmr2->curvol && !fmr2->mute)
                         {
                                 fmr2_setvolume(fmr2);
                                 fmr2_setfreq(fmr2);
                         }
                         else fmr2_mute(fmr2->port);
-                        up(&lock);
+                        mutex_unlock(&lock);
                         return 0;
                 }
                 case VIDIOCGUNIT:
@@ -380,7 +380,7 @@ static int __init fmr2_init(void)
         fmr2_unit.card_type = 0;
         fmr2_radio.priv = &fmr2_unit;
 
-        init_MUTEX(&lock);
+        mutex_init(&lock);
 
         if (request_region(io, 2, "sf16fmr2"))
         {
@@ -397,10 +397,10 @@ static int __init fmr2_init(void)
         printk(KERN_INFO "SF16FMR2 radio card driver at 0x%x.\n", io);
         debug_print((KERN_DEBUG "Mute %d Low %d\n",VIDEO_AUDIO_MUTE,VIDEO_TUNER_LOW));
         /* mute card - prevents noisy bootups */
-        down(&lock);
+        mutex_lock(&lock);
         fmr2_mute(io);
         fmr2_product_info(&fmr2_unit);
-        up(&lock);
+        mutex_unlock(&lock);
         debug_print((KERN_DEBUG "card_type %d\n", fmr2_unit.card_type));
         return 0;
 }
diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c
index 8ac9a8ef9094..e50955836d6b 100644
--- a/drivers/media/radio/radio-typhoon.c
+++ b/drivers/media/radio/radio-typhoon.c
@@ -59,7 +59,7 @@ struct typhoon_device {
         int muted;
         unsigned long curfreq;
         unsigned long mutefreq;
-        struct semaphore lock;
+        struct mutex lock;
 };
 
 static void typhoon_setvol_generic(struct typhoon_device *dev, int vol);
@@ -77,12 +77,12 @@ static int typhoon_get_info(char *buf, char **start, off_t offset, int len);
 
 static void typhoon_setvol_generic(struct typhoon_device *dev, int vol)
 {
-        down(&dev->lock);
+        mutex_lock(&dev->lock);
         vol >>= 14;                             /* Map 16 bit to 2 bit */
         vol &= 3;
         outb_p(vol / 2, dev->iobase);           /* Set the volume, high bit. */
         outb_p(vol % 2, dev->iobase + 2);       /* Set the volume, low bit. */
-        up(&dev->lock);
+        mutex_unlock(&dev->lock);
 }
 
 static int typhoon_setfreq_generic(struct typhoon_device *dev,
@@ -102,7 +102,7 @@ static int typhoon_setfreq_generic(struct typhoon_device *dev,
          *
          */
 
-        down(&dev->lock);
+        mutex_lock(&dev->lock);
         x = frequency / 160;
         outval = (x * x + 2500) / 5000;
         outval = (outval * x + 5000) / 10000;
@@ -112,7 +112,7 @@ static int typhoon_setfreq_generic(struct typhoon_device *dev,
         outb_p((outval >> 8) & 0x01, dev->iobase + 4);
         outb_p(outval >> 9, dev->iobase + 6);
         outb_p(outval & 0xff, dev->iobase + 8);
-        up(&dev->lock);
+        mutex_unlock(&dev->lock);
 
         return 0;
 }
@@ -337,7 +337,7 @@ static int __init typhoon_init(void)
 #endif /* MODULE */
 
         printk(KERN_INFO BANNER);
-        init_MUTEX(&typhoon_unit.lock);
+        mutex_init(&typhoon_unit.lock);
         io = typhoon_unit.iobase;
         if (!request_region(io, 8, "typhoon")) {
                 printk(KERN_ERR "radio-typhoon: port 0x%x already in use\n",
diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c
index d590e80c922e..7bf1a4264891 100644
--- 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;
-        struct semaphore lock;
+        struct mutex lock;
 };
 
 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;
 
-        down(&dev->lock);
+        mutex_lock(&dev->lock);
         if (vol == 0) {
                 outb(0, io);
                 outb(0, io);
                 inb(io + 3);    /* Zoltrix needs to be read to confirm */
-                up(&dev->lock);
+                mutex_unlock(&dev->lock);
                 return 0;
         }
 
         outb(dev->curvol-1, io);
         msleep(10);
         inb(io + 2);
-        up(&dev->lock);
+        mutex_unlock(&dev->lock);
         return 0;
 }
 
 static void zol_mute(struct zol_device *dev)
 {
         dev->muted = 1;
-        down(&dev->lock);
+        mutex_lock(&dev->lock);
         outb(0, io);
         outb(0, io);
         inb(io + 3);            /* Zoltrix needs to be read to confirm */
-        up(&dev->lock);
+        mutex_unlock(&dev->lock);
 }
 
 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;
 
-        down(&dev->lock);
+        mutex_lock(&dev->lock);
         
         outb(0, io);
         outb(0, io);
@@ -149,7 +149,7 @@ static int zol_setfreq(struct zol_device *dev, unsigned long freq)
                 udelay(1000);
         }
         
-        up(&dev->lock);
+        mutex_unlock(&dev->lock);
         
         if(!dev->muted)
         {
@@ -164,7 +164,7 @@ static int zol_getsigstr(struct zol_device *dev)
 {
         int a, b;
 
-        down(&dev->lock);
+        mutex_lock(&dev->lock);
         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);
 
-        up(&dev->lock);
+        mutex_unlock(&dev->lock);
         
         if (a != b)
                 return (0);
@@ -188,7 +188,7 @@ static int zol_is_stereo (struct zol_device *dev)
 {
         int x1, x2;
 
-        down(&dev->lock);
+        mutex_lock(&dev->lock);
         
         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);
 
-        up(&dev->lock);
+        mutex_unlock(&dev->lock);
         
         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");
 
-        init_MUTEX(&zoltrix_unit.lock);
+        mutex_init(&zoltrix_unit.lock);
         
         /* mute card - prevents noisy bootups */