V4L/DVB (12939): SAA7164: Removed a duplicate call to address any PCI quirks.

[safe/jmp/linux-2.6] / drivers / media / radio / radio-terratec.c

diff --git a/drivers/media/radio/radio-terratec.c b/drivers/media/radio/radio-terratec.c
index 5a37e0d..699db9a 100644 (file)
--- a/drivers/media/radio/radio-terratec.c
+++ b/drivers/media/radio/radio-terratec.c
@@ -27,12 +27,10 @@
 #include <linux/module.h>      /* Modules                      */
 #include <linux/init.h>                /* Initdata                     */
 #include <linux/ioport.h>      /* request_region               */
-#include <linux/delay.h>       /* udelay                       */
 #include <linux/videodev2.h>   /* kernel radio structs         */
 #include <linux/mutex.h>
 #include <linux/version.h>      /* for KERNEL_VERSION MACRO     */
 #include <linux/io.h>          /* outb, outb_p                 */
-#include <linux/uaccess.h>     /* copy to/from user            */
 #include <media/v4l2-device.h>
 #include <media/v4l2-ioctl.h>
 
@@ -334,20 +332,8 @@ static int vidioc_s_audio(struct file *file, void *priv,
        return a->index ? -EINVAL : 0;
 }
 
-static int terratec_open(struct file *file)
-{
-       return 0;
-}
-
-static int terratec_release(struct file *file)
-{
-       return 0;
-}
-
 static const struct v4l2_file_operations terratec_fops = {
        .owner          = THIS_MODULE,
-       .open           = terratec_open,
-       .release        = terratec_release,
        .ioctl          = video_ioctl2,
 };
 
@@ -375,7 +361,7 @@ static int __init terratec_init(void)
        strlcpy(v4l2_dev->name, "terratec", sizeof(v4l2_dev->name));
        tt->io = io;
        if (tt->io == -1) {
-               v4l2_err(v4l2_dev, "you must set an I/O address with io=0x???\n");
+               v4l2_err(v4l2_dev, "you must set an I/O address with io=0x590 or 0x591\n");
                return -EINVAL;
        }
        if (!request_region(tt->io, 2, "terratec")) {