Merge git://git.kernel.org/pub/scm/linux/kernel/git/sfrench/cifs-2.6

[pandora-kernel.git] / drivers / media / radio / radio-sf16fmi.c

diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index 6f03ce4..efee6e3 100644 (file)
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -12,7 +12,7 @@
  *  Frequency control is done digitally -- ie out(port,encodefreq(95.8));
  *  No volume control - only mute/unmute - you have to use line volume
  *  control on SB-part of SF16FMI
- *  
+ *
  */
 
 #include <linux/kernel.h>      /* __setup                      */
@@ -21,27 +21,28 @@
 #include <linux/ioport.h>      /* request_region               */
 #include <linux/delay.h>       /* udelay                       */
 #include <linux/videodev.h>    /* kernel radio structs         */
+#include <media/v4l2-common.h>
 #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
 {
        int port;
-        int curvol; /* 1 or 0 */
-        unsigned long curfreq; /* freq in kHz */
-        __u32 flags;
+       int curvol; /* 1 or 0 */
+       unsigned long curfreq; /* freq in kHz */
+       __u32 flags;
 };
 
-static int io = -1; 
+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),
- * other bits will be truncated, e.g 92.7400016 -> 92.7, but 
+ * other bits will be truncated, e.g 92.7400016 -> 92.7, but
  * 92.7400017 -> 92.75
  */
 #define RSF16_ENCODE(x)        ((x)/800+214)
@@ -51,7 +52,7 @@ static struct semaphore lock;
 static void outbits(int bits, unsigned int data, int port)
 {
        while(bits--) {
-               if(data & 1) {
+               if(data & 1) {
                        outb(5, port);
                        udelay(6);
                        outb(7, port);
@@ -68,16 +69,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 +86,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;
 }
@@ -101,16 +102,16 @@ static inline int fmi_getsigstr(struct fmi_device *dev)
        int res;
        int myport = dev->port;
 
-       
-       down(&lock);
+
+       mutex_lock(&lock);
        val = dev->curvol ? 0x08 : 0x00;        /* unmute/mute */
        outb(val, myport);
        outb(val | 0x10, myport);
        msleep(143);            /* was schedule_timeout(HZ/7) */
        res = (int)inb(myport+1);
        outb(val, myport);
-       
-       up(&lock);
+
+       mutex_unlock(&lock);
        return (res & 2) ? 0 : 0xFFFF;
 }
 
@@ -119,7 +120,7 @@ static int fmi_do_ioctl(struct inode *inode, struct file *file,
 {
        struct video_device *dev = video_devdata(file);
        struct fmi_device *fmi=dev->priv;
-       
+
        switch(cmd)
        {
                case VIDIOCGCAP:
@@ -174,18 +175,18 @@ static int fmi_do_ioctl(struct inode *inode, struct file *file,
                                return -EINVAL;
                        /*rounding in steps of 800 to match th freq
                          that will be used */
-                       fmi->curfreq = (*freq/800)*800; 
+                       fmi->curfreq = (*freq/800)*800;
                        fmi_setfreq(fmi);
                        return 0;
                }
                case VIDIOCGAUDIO:
-               {       
+               {
                        struct video_audio *v = arg;
                        memset(v,0,sizeof(*v));
                        v->flags=( (!fmi->curvol)*VIDEO_AUDIO_MUTE | VIDEO_AUDIO_MUTABLE);
                        strcpy(v->name, "Radio");
                        v->mode=VIDEO_SOUND_STEREO;
-                       return 0;                       
+                       return 0;
                }
                case VIDIOCSAUDIO:
                {
@@ -193,19 +194,19 @@ static int fmi_do_ioctl(struct inode *inode, struct file *file,
                        if(v->audio)
                                return -EINVAL;
                        fmi->curvol= v->flags&VIDEO_AUDIO_MUTE ? 0 : 1;
-                       fmi->curvol ? 
+                       fmi->curvol ?
                                fmi_unmute(fmi->port) : fmi_mute(fmi->port);
                        return 0;
                }
-               case VIDIOCGUNIT:
+               case VIDIOCGUNIT:
                {
-                               struct video_unit *v = arg;
+                       struct video_unit *v = arg;
                        v->video=VIDEO_NO_UNIT;
                        v->vbi=VIDEO_NO_UNIT;
                        v->radio=dev->minor;
                        v->audio=0; /* How do we find out this??? */
                        v->teletext=VIDEO_NO_UNIT;
-                       return 0;                       
+                       return 0;
                }
                default:
                        return -ENOIOCTLCMD;
@@ -225,6 +226,7 @@ static struct file_operations fmi_fops = {
        .open           = video_exclusive_open,
        .release        = video_exclusive_release,
        .ioctl          = fmi_ioctl,
+       .compat_ioctl   = v4l_compat_ioctl32,
        .llseek         = no_llseek,
 };
 
@@ -294,14 +296,14 @@ static int __init fmi_init(void)
        fmi_unit.curfreq = 0;
        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);
                return -EINVAL;
        }
-               
+
        printk(KERN_INFO "SF16FMx radio card driver at 0x%x\n", io);
        /* mute card - prevents noisy bootups */
        fmi_mute(io);