18 files changed, 151 insertions, 96 deletions

diff --git a/drivers/media/radio/dsbr100.c b/drivers/media/radio/dsbr100.c
index 36c0e3651502..4e3f83e4e48f 100644
--- a/drivers/media/radio/dsbr100.c
+++ b/drivers/media/radio/dsbr100.c
@@ -438,7 +438,9 @@ static const struct file_operations usb_dsbr100_fops = {
         .open           = usb_dsbr100_open,
         .release        = usb_dsbr100_close,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/miropcm20-radio.c b/drivers/media/radio/miropcm20-radio.c
index 3ae56fef8c92..09fe6f1cdf14 100644
--- a/drivers/media/radio/miropcm20-radio.c
+++ b/drivers/media/radio/miropcm20-radio.c
@@ -221,7 +221,9 @@ static const struct file_operations pcm20_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = pcm20_ioctl,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/miropcm20-rds.c b/drivers/media/radio/miropcm20-rds.c
index aed11477378b..06dfed9ef4c7 100644
--- a/drivers/media/radio/miropcm20-rds.c
+++ b/drivers/media/radio/miropcm20-rds.c
@@ -19,7 +19,7 @@
 #include "miropcm20-rds-core.h"
 
 static char * text_buffer;
-static int rds_users = 0;
+static int rds_users;
 
 
 static int rds_f_open(struct inode *in, struct file *fi)
diff --git a/drivers/media/radio/radio-aimslab.c b/drivers/media/radio/radio-aimslab.c
index c69bde39a233..1ec18ed1a733 100644
--- a/drivers/media/radio/radio-aimslab.c
+++ b/drivers/media/radio/radio-aimslab.c
@@ -382,7 +382,9 @@ static const struct file_operations rtrack_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-aztech.c b/drivers/media/radio/radio-aztech.c
index 9b1f7a99dac0..46cdb549eac7 100644
--- a/drivers/media/radio/radio-aztech.c
+++ b/drivers/media/radio/radio-aztech.c
@@ -346,7 +346,9 @@ static const struct file_operations aztech_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-cadet.c b/drivers/media/radio/radio-cadet.c
index 57b9e3adc8f0..b14db53ea456 100644
--- a/drivers/media/radio/radio-cadet.c
+++ b/drivers/media/radio/radio-cadet.c
@@ -69,13 +69,13 @@ static struct v4l2_queryctrl radio_qctrl[] = {
 
 static int io=-1;               /* default to isapnp activation */
 static int radio_nr = -1;
-static int users=0;
-static int curtuner=0;
-static int tunestat=0;
-static int sigstrength=0;
+static int users;
+static int curtuner;
+static int tunestat;
+static int sigstrength;
 static wait_queue_head_t read_queue;
 static struct timer_list readtimer;
-static __u8 rdsin=0,rdsout=0,rdsstat=0;
+static __u8 rdsin, rdsout, rdsstat;
 static unsigned char rdsbuf[RDS_BUFFER];
 static spinlock_t cadet_io_lock;
 
@@ -563,7 +563,9 @@ static const struct file_operations cadet_fops = {
         .read           = cadet_read,
         .ioctl          = video_ioctl2,
         .poll           = cadet_poll,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-gemtek-pci.c b/drivers/media/radio/radio-gemtek-pci.c
index 99a323131333..de49be971480 100644
--- a/drivers/media/radio/radio-gemtek-pci.c
+++ b/drivers/media/radio/radio-gemtek-pci.c
@@ -368,7 +368,9 @@ static const struct file_operations gemtek_pci_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-gemtek.c b/drivers/media/radio/radio-gemtek.c
index 246422b49267..81f6aeb1cd11 100644
--- a/drivers/media/radio/radio-gemtek.c
+++ b/drivers/media/radio/radio-gemtek.c
@@ -397,7 +397,9 @@ static const struct file_operations gemtek_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek
 };
 
diff --git a/drivers/media/radio/radio-maestro.c b/drivers/media/radio/radio-maestro.c
index bc51f4d23a5a..bddd3c409aa9 100644
--- a/drivers/media/radio/radio-maestro.c
+++ b/drivers/media/radio/radio-maestro.c
@@ -100,7 +100,9 @@ static const struct file_operations maestro_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-maxiradio.c b/drivers/media/radio/radio-maxiradio.c
index 8e184cfc1c94..0133ecf3e040 100644
--- a/drivers/media/radio/radio-maxiradio.c
+++ b/drivers/media/radio/radio-maxiradio.c
@@ -103,7 +103,9 @@ static const struct file_operations maxiradio_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-rtrack2.c b/drivers/media/radio/radio-rtrack2.c
index 82aedfc95d4f..070802103dc3 100644
--- a/drivers/media/radio/radio-rtrack2.c
+++ b/drivers/media/radio/radio-rtrack2.c
@@ -288,7 +288,9 @@ static const struct file_operations rtrack2_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-sf16fmi.c b/drivers/media/radio/radio-sf16fmi.c
index 53e114857377..66e052fd3909 100644
--- a/drivers/media/radio/radio-sf16fmi.c
+++ b/drivers/media/radio/radio-sf16fmi.c
@@ -288,7 +288,9 @@ static const struct file_operations fmi_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-sf16fmr2.c b/drivers/media/radio/radio-sf16fmr2.c
index ebc5fbbc38bb..b0ccf7cb5952 100644
--- a/drivers/media/radio/radio-sf16fmr2.c
+++ b/drivers/media/radio/radio-sf16fmr2.c
@@ -29,6 +29,8 @@ static struct mutex lock;
 #include <linux/version.h>      /* for KERNEL_VERSION MACRO     */
 #define RADIO_VERSION KERNEL_VERSION(0,0,2)
 
+#define AUD_VOL_INDEX 1
+
 static struct v4l2_queryctrl radio_qctrl[] = {
         {
                 .id            = V4L2_CID_AUDIO_MUTE,
@@ -37,13 +39,14 @@ static struct v4l2_queryctrl radio_qctrl[] = {
                 .maximum       = 1,
                 .default_value = 1,
                 .type          = V4L2_CTRL_TYPE_BOOLEAN,
-        },{
+        },
+        [AUD_VOL_INDEX] = {
                 .id            = V4L2_CID_AUDIO_VOLUME,
                 .name          = "Volume",
                 .minimum       = 0,
-                .maximum       = 65535,
-                .step          = 1<<12,
-                .default_value = 0xff,
+                .maximum       = 15,
+                .step          = 1,
+                .default_value = 0,
                 .type          = V4L2_CTRL_TYPE_INTEGER,
         }
 };
@@ -61,7 +64,7 @@ static struct v4l2_queryctrl radio_qctrl[] = {
 struct fmr2_device
 {
         int port;
-        int curvol; /* 0-65535, if not volume 0 or 65535 */
+        int curvol; /* 0-15 */
         int mute;
         int stereo; /* card is producing stereo audio */
         unsigned long curfreq; /* freq in kHz */
@@ -176,51 +179,35 @@ static int fmr2_setfreq(struct fmr2_device *dev)
 /* !!! not tested, in my card this does't work !!! */
 static int fmr2_setvolume(struct fmr2_device *dev)
 {
-        int i,a,n, port = dev->port;
+        int vol[16] = { 0x021, 0x084, 0x090, 0x104,
+                        0x110, 0x204, 0x210, 0x402,
+                        0x404, 0x408, 0x410, 0x801,
+                        0x802, 0x804, 0x808, 0x810 };
+        int i, a, port = dev->port;
+        int n = vol[dev->curvol & 0x0f];
 
-        if (dev->card_type != 11) return 1;
+        if (dev->card_type != 11)
+                return 1;
 
-        switch( (dev->curvol+(1<<11)) >> 12 )
-        {
-        case 0: case 1: n = 0x21; break;
-        case 2: n = 0x84; break;
-        case 3: n = 0x90; break;
-        case 4: n = 0x104; break;
-        case 5: n = 0x110; break;
-        case 6: n = 0x204; break;
-        case 7: n = 0x210; break;
-        case 8: n = 0x402; break;
-        case 9: n = 0x404; break;
-        default:
-        case 10: n = 0x408; break;
-        case 11: n = 0x410; break;
-        case 12: n = 0x801; break;
-        case 13: n = 0x802; break;
-        case 14: n = 0x804; break;
-        case 15: n = 0x808; break;
-        case 16: n = 0x810; break;
-        }
-        for(i=12;--i>=0;)
-        {
+        for (i = 12; --i >= 0; ) {
                 a = ((n >> i) & 1) << 6; /* if (a=0) a= 0; else a= 0x40; */
-                outb(a|4, port);
-                wait(4,port);
-                outb(a|0x24, port);
-                wait(4,port);
-                outb(a|4, port);
-                wait(4,port);
+                outb(a | 4, port);
+                wait(4, port);
+                outb(a | 0x24, port);
+                wait(4, port);
+                outb(a | 4, port);
+                wait(4, port);
         }
-        for(i=6;--i>=0;)
-        {
+        for (i = 6; --i >= 0; ) {
                 a = ((0x18 >> i) & 1) << 6;
-                outb(a|4, port);
+                outb(a | 4, port);
                 wait(4,port);
-                outb(a|0x24, port);
+                outb(a | 0x24, port);
                 wait(4,port);
                 outb(a|4, port);
                 wait(4,port);
         }
-        wait(4,port);
+        wait(4, port);
         outb(0x14, port);
 
         return 0;
@@ -312,16 +299,10 @@ static int vidioc_queryctrl(struct file *file, void *priv,
                                         struct v4l2_queryctrl *qc)
 {
         int i;
-        struct video_device *dev = video_devdata(file);
-        struct fmr2_device *fmr2 = dev->priv;
 
         for (i = 0; i < ARRAY_SIZE(radio_qctrl); i++) {
-                if ((fmr2->card_type != 11)
-                                && V4L2_CID_AUDIO_VOLUME)
-                        radio_qctrl[i].step = 65535;
                 if (qc->id && qc->id == radio_qctrl[i].id) {
-                        memcpy(qc, &(radio_qctrl[i]),
-                                                sizeof(*qc));
+                        memcpy(qc, &radio_qctrl[i], sizeof(*qc));
                         return 0;
                 }
         }
@@ -354,24 +335,13 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_MUTE:
                 fmr2->mute = ctrl->value;
-                if (fmr2->card_type != 11) {
-                        if (!fmr2->mute)
-                                fmr2->curvol = 65535;
-                        else
-                                fmr2->curvol = 0;
-                }
                 break;
         case V4L2_CID_AUDIO_VOLUME:
-                fmr2->curvol = ctrl->value;
-                if (fmr2->card_type != 11) {
-                        if (fmr2->curvol) {
-                                fmr2->curvol = 65535;
-                                fmr2->mute = 0;
-                        } else {
-                                fmr2->curvol = 0;
-                                fmr2->mute = 1;
-                        }
-                }
+                if (ctrl->value > radio_qctrl[AUD_VOL_INDEX].maximum)
+                        fmr2->curvol = radio_qctrl[AUD_VOL_INDEX].maximum;
+                else
+                        fmr2->curvol = ctrl->value;
+
                 break;
         default:
                 return -EINVAL;
@@ -387,6 +357,7 @@ static int vidioc_s_ctrl(struct file *file, void *priv,
         mutex_lock(&lock);
         if (fmr2->curvol && !fmr2->mute) {
                 fmr2_setvolume(fmr2);
+                /* Set frequency and unmute card */
                 fmr2_setfreq(fmr2);
         } else
                 fmr2_mute(fmr2->port);
@@ -433,7 +404,9 @@ static const struct file_operations fmr2_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
@@ -487,6 +460,11 @@ static int __init fmr2_init(void)
         fmr2_product_info(&fmr2_unit);
         mutex_unlock(&lock);
         debug_print((KERN_DEBUG "card_type %d\n", fmr2_unit.card_type));
+
+        /* Only card_type == 11 implements volume */
+        if (fmr2_unit.card_type != 11)
+                radio_qctrl[AUD_VOL_INDEX].maximum = 1;
+
         return 0;
 }
 
diff --git a/drivers/media/radio/radio-si470x.c b/drivers/media/radio/radio-si470x.c
index 649f14d2c013..77354ca6e8e9 100644
--- a/drivers/media/radio/radio-si470x.c
+++ b/drivers/media/radio/radio-si470x.c
@@ -85,6 +85,7 @@
  *              Oliver Neukum <oliver@neukum.org>
  *              Version 1.0.7
  *              - usb autosuspend support
+ *             - unplugging fixed
  *
  * ToDo:
  * - add seeking support
@@ -97,10 +98,10 @@
 /* driver definitions */
 #define DRIVER_AUTHOR "Tobias Lorenz <tobias.lorenz@gmx.net>"
 #define DRIVER_NAME "radio-si470x"
-#define DRIVER_KERNEL_VERSION KERNEL_VERSION(1, 0, 6)
+#define DRIVER_KERNEL_VERSION KERNEL_VERSION(1, 0, 7)
 #define DRIVER_CARD "Silicon Labs Si470x FM Radio Receiver"
 #define DRIVER_DESC "USB radio driver for Si470x FM Radio Receivers"
-#define DRIVER_VERSION "1.0.6"
+#define DRIVER_VERSION "1.0.7"
 
 
 /* kernel includes */
@@ -424,6 +425,7 @@ struct si470x_device {
 
         /* driver management */
         unsigned int users;
+       unsigned char disconnected;
 
         /* Silabs internal registers (0..15) */
         unsigned short registers[RADIO_REGISTER_NUM];
@@ -440,6 +442,12 @@ struct si470x_device {
 
 
 /*
+ * Lock to prevent kfree of data before all users have releases the device.
+ */
+static DEFINE_MUTEX(open_close_lock);
+
+
+/*
  * The frequency is set in units of 62.5 Hz when using V4L2_TUNER_CAP_LOW,
  * 62.5 kHz otherwise.
  * The tuner is able to have a channel spacing of 50, 100 or 200 kHz.
@@ -577,7 +585,7 @@ static int si470x_get_rds_registers(struct si470x_device *radio)
                 usb_rcvintpipe(radio->usbdev, 1),
                 (void *) &buf, sizeof(buf), &size, usb_timeout);
         if (size != sizeof(buf))
-                printk(KERN_WARNING DRIVER_NAME ": si470x_get_rds_register: "
+               printk(KERN_WARNING DRIVER_NAME ": si470x_get_rds_registers: "
                         "return size differs: %d != %zu\n", size, sizeof(buf));
         if (retval < 0)
                 printk(KERN_WARNING DRIVER_NAME ": si470x_get_rds_registers: "
@@ -875,6 +883,8 @@ static void si470x_work(struct work_struct *work)
         struct si470x_device *radio = container_of(work, struct si470x_device,
                 work.work);
 
+       if (radio->disconnected)
+               return;
         if ((radio->registers[SYSCONFIG1] & SYSCONFIG1_RDS) == 0)
                 return;
 
@@ -1001,13 +1011,21 @@ static int si470x_fops_open(struct inode *inode, struct file *file)
 static int si470x_fops_release(struct inode *inode, struct file *file)
 {
         struct si470x_device *radio = video_get_drvdata(video_devdata(file));
-        int retval;
+       int retval = 0;
 
         if (!radio)
                 return -ENODEV;
 
+       mutex_lock(&open_close_lock);
         radio->users--;
         if (radio->users == 0) {
+               if (radio->disconnected) {
+                       video_unregister_device(radio->videodev);
+                       kfree(radio->buffer);
+                       kfree(radio);
+                       goto done;
+               }
+
                 /* stop rds reception */
                 cancel_delayed_work_sync(&radio->work);
 
@@ -1016,10 +1034,11 @@ static int si470x_fops_release(struct inode *inode, struct file *file)
 
                 retval = si470x_stop(radio);
                 usb_autopm_put_interface(radio->intf);
-                return retval;
         }
 
-        return 0;
+done:
+       mutex_unlock(&open_close_lock);
+       return retval;
 }
 
 
@@ -1032,7 +1051,9 @@ static const struct file_operations si470x_fops = {
         .read           = si470x_fops_read,
         .poll           = si470x_fops_poll,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .open           = si470x_fops_open,
         .release        = si470x_fops_release,
 };
@@ -1157,6 +1178,9 @@ static int si470x_vidioc_g_ctrl(struct file *file, void *priv,
 {
         struct si470x_device *radio = video_get_drvdata(video_devdata(file));
 
+       if (radio->disconnected)
+               return -EIO;
+
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_VOLUME:
                 ctrl->value = radio->registers[SYSCONFIG2] &
@@ -1181,6 +1205,9 @@ static int si470x_vidioc_s_ctrl(struct file *file, void *priv,
         struct si470x_device *radio = video_get_drvdata(video_devdata(file));
         int retval;
 
+       if (radio->disconnected)
+               return -EIO;
+
         switch (ctrl->id) {
         case V4L2_CID_AUDIO_VOLUME:
                 radio->registers[SYSCONFIG2] &= ~SYSCONFIG2_VOLUME;
@@ -1243,6 +1270,8 @@ static int si470x_vidioc_g_tuner(struct file *file, void *priv,
         struct si470x_device *radio = video_get_drvdata(video_devdata(file));
         int retval;
 
+       if (radio->disconnected)
+               return -EIO;
         if (tuner->index > 0)
                 return -EINVAL;
 
@@ -1299,6 +1328,8 @@ static int si470x_vidioc_s_tuner(struct file *file, void *priv,
         struct si470x_device *radio = video_get_drvdata(video_devdata(file));
         int retval;
 
+       if (radio->disconnected)
+               return -EIO;
         if (tuner->index > 0)
                 return -EINVAL;
 
@@ -1324,6 +1355,9 @@ static int si470x_vidioc_g_frequency(struct file *file, void *priv,
 {
         struct si470x_device *radio = video_get_drvdata(video_devdata(file));
 
+       if (radio->disconnected)
+               return -EIO;
+
         freq->type = V4L2_TUNER_RADIO;
         freq->frequency = si470x_get_freq(radio);
 
@@ -1340,6 +1374,8 @@ static int si470x_vidioc_s_frequency(struct file *file, void *priv,
         struct si470x_device *radio = video_get_drvdata(video_devdata(file));
         int retval;
 
+       if (radio->disconnected)
+               return -EIO;
         if (freq->type != V4L2_TUNER_RADIO)
                 return -EINVAL;
 
@@ -1510,11 +1546,16 @@ static void si470x_usb_driver_disconnect(struct usb_interface *intf)
 {
         struct si470x_device *radio = usb_get_intfdata(intf);
 
+       mutex_lock(&open_close_lock);
+       radio->disconnected = 1;
         cancel_delayed_work_sync(&radio->work);
         usb_set_intfdata(intf, NULL);
-        video_unregister_device(radio->videodev);
-        kfree(radio->buffer);
-        kfree(radio);
+       if (radio->users == 0) {
+               video_unregister_device(radio->videodev);
+               kfree(radio->buffer);
+               kfree(radio);
+       }
+       mutex_unlock(&open_close_lock);
 }
 
 
diff --git a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c
index 535ffe8c8102..acc32080e9bd 100644
--- a/drivers/media/radio/radio-terratec.c
+++ b/drivers/media/radio/radio-terratec.c
@@ -360,7 +360,9 @@ static const struct file_operations terratec_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-trust.c b/drivers/media/radio/radio-trust.c
index c11981fed827..4ebdfbadeb9c 100644
--- a/drivers/media/radio/radio-trust.c
+++ b/drivers/media/radio/radio-trust.c
@@ -340,7 +340,9 @@ static const struct file_operations trust_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
diff --git a/drivers/media/radio/radio-typhoon.c b/drivers/media/radio/radio-typhoon.c
index 1366326474e5..18f2abd7e255 100644
--- a/drivers/media/radio/radio-typhoon.c
+++ b/drivers/media/radio/radio-typhoon.c
@@ -35,6 +35,7 @@
 #include <linux/init.h>         /* Initdata                       */
 #include <linux/ioport.h>       /* request_region                 */
 #include <linux/proc_fs.h>      /* radio card status report       */
+#include <linux/seq_file.h>
 #include <asm/io.h>             /* outb, outb_p                   */
 #include <asm/uaccess.h>        /* copy to/from user              */
 #include <linux/videodev2.h>    /* kernel radio structs           */
@@ -93,9 +94,6 @@ static int typhoon_setfreq(struct typhoon_device *dev, unsigned long frequency);
 static void typhoon_mute(struct typhoon_device *dev);
 static void typhoon_unmute(struct typhoon_device *dev);
 static int typhoon_setvol(struct typhoon_device *dev, int vol);
-#ifdef CONFIG_RADIO_TYPHOON_PROC_FS
-static int typhoon_get_info(char *buf, char **start, off_t offset, int len);
-#endif
 
 static void typhoon_setvol_generic(struct typhoon_device *dev, int vol)
 {
@@ -340,7 +338,9 @@ static const struct file_operations typhoon_fops = {
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };
 
@@ -366,30 +366,39 @@ static struct video_device typhoon_radio =
 
 #ifdef CONFIG_RADIO_TYPHOON_PROC_FS
 
-static int typhoon_get_info(char *buf, char **start, off_t offset, int len)
+static int typhoon_proc_show(struct seq_file *m, void *v)
 {
-        char *out = buf;
-
         #ifdef MODULE
             #define MODULEPROCSTRING "Driver loaded as a module"
         #else
             #define MODULEPROCSTRING "Driver compiled into kernel"
         #endif
 
-        /* output must be kept under PAGE_SIZE */
-        out += sprintf(out, BANNER);
-        out += sprintf(out, "Load type: " MODULEPROCSTRING "\n\n");
-        out += sprintf(out, "frequency = %lu kHz\n",
+        seq_puts(m, BANNER);
+        seq_puts(m, "Load type: " MODULEPROCSTRING "\n\n");
+        seq_printf(m, "frequency = %lu kHz\n",
                 typhoon_unit.curfreq >> 4);
-        out += sprintf(out, "volume = %d\n", typhoon_unit.curvol);
-        out += sprintf(out, "mute = %s\n", typhoon_unit.muted ?
+        seq_printf(m, "volume = %d\n", typhoon_unit.curvol);
+        seq_printf(m, "mute = %s\n", typhoon_unit.muted ?
                 "on" : "off");
-        out += sprintf(out, "iobase = 0x%x\n", typhoon_unit.iobase);
-        out += sprintf(out, "mute frequency = %lu kHz\n",
+        seq_printf(m, "iobase = 0x%x\n", typhoon_unit.iobase);
+        seq_printf(m, "mute frequency = %lu kHz\n",
                 typhoon_unit.mutefreq >> 4);
-        return out - buf;
+        return 0;
 }
 
+static int typhoon_proc_open(struct inode *inode, struct file *file)
+{
+        return single_open(file, typhoon_proc_show, NULL);
+}
+
+static const struct file_operations typhoon_proc_fops = {
+        .owner          = THIS_MODULE,
+        .open           = typhoon_proc_open,
+        .read           = seq_read,
+        .llseek         = seq_lseek,
+        .release        = single_release,
+};
 #endif /* CONFIG_RADIO_TYPHOON_PROC_FS */
 
 MODULE_AUTHOR("Dr. Henrik Seidel");
@@ -404,7 +413,7 @@ MODULE_PARM_DESC(io, "I/O address of the Typhoon card (0x316 or 0x336)");
 module_param(radio_nr, int, 0);
 
 #ifdef MODULE
-static unsigned long mutefreq = 0;
+static unsigned long mutefreq;
 module_param(mutefreq, ulong, 0);
 MODULE_PARM_DESC(mutefreq, "Frequency used when muting the card (in kHz)");
 #endif
@@ -450,8 +459,7 @@ static int __init typhoon_init(void)
         typhoon_mute(&typhoon_unit);
 
 #ifdef CONFIG_RADIO_TYPHOON_PROC_FS
-        if (!create_proc_info_entry("driver/radio-typhoon", 0, NULL,
-                                    typhoon_get_info))
+        if (!proc_create("driver/radio-typhoon", 0, NULL, &typhoon_proc_fops))
                 printk(KERN_ERR "radio-typhoon: registering /proc/driver/radio-typhoon failed\n");
 #endif
 
diff --git a/drivers/media/radio/radio-zoltrix.c b/drivers/media/radio/radio-zoltrix.c
index 203f4373eeb8..43773c56c62f 100644
--- a/drivers/media/radio/radio-zoltrix.c
+++ b/drivers/media/radio/radio-zoltrix.c
@@ -401,7 +401,9 @@ static const struct file_operations zoltrix_fops =
         .open           = video_exclusive_open,
         .release        = video_exclusive_release,
         .ioctl          = video_ioctl2,
+#ifdef CONFIG_COMPAT
         .compat_ioctl   = v4l_compat_ioctl32,
+#endif
         .llseek         = no_llseek,
 };