V4L/DVB (13554a): v4l: Use the video_drvdata function in drivers

Fix all device drivers to use the video_drvdata function instead of
maintaining a local list of minor to private data mappings. Call
video_set_drvdata to register the driver private pointer when not
already done.

Where applicable, the local list of mappings is completely removed when
it becomes unused.

[mchehab.redhat.com: removed tm6000 changes as tm6000 is not ready yet for submission even on staging]

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

3 files changed, 16 insertions, 28 deletions

diff --git a/drivers/media/video/saa7134/saa7134-core.c b/drivers/media/video/saa7134/saa7134-core.c
index b910df94ed72..9f85e917f9f3 100644
--- a/drivers/media/video/saa7134/saa7134-core.c
+++ b/drivers/media/video/saa7134/saa7134-core.c
@@ -797,6 +797,7 @@ static struct video_device *vdev_init(struct saa7134_dev *dev,
         vfd->debug   = video_debug;
         snprintf(vfd->name, sizeof(vfd->name), "%s %s (%s)",
                  dev->name, type, saa7134_boards[dev->board].name);
+        video_set_drvdata(vfd, dev);
         return vfd;
 }
 
diff --git a/drivers/media/video/saa7134/saa7134-empress.c b/drivers/media/video/saa7134/saa7134-empress.c
index abc1d0bf5837..1de27af54590 100644
--- a/drivers/media/video/saa7134/saa7134-empress.c
+++ b/drivers/media/video/saa7134/saa7134-empress.c
@@ -87,17 +87,9 @@ static int ts_init_encoder(struct saa7134_dev* dev)
 static int ts_open(struct file *file)
 {
         int minor = video_devdata(file)->minor;
-        struct saa7134_dev *dev;
+        struct saa7134_dev *dev = video_drvdata(file);
         int err;
 
-        lock_kernel();
-        list_for_each_entry(dev, &saa7134_devlist, devlist)
-                if (dev->empress_dev && dev->empress_dev->minor == minor)
-                        goto found;
-        unlock_kernel();
-        return -ENODEV;
- found:
-
         dprintk("open minor=%d\n",minor);
         err = -EBUSY;
         if (!mutex_trylock(&dev->empress_tsq.vb_lock))
@@ -531,6 +523,7 @@ static int empress_init(struct saa7134_dev *dev)
 
         INIT_WORK(&dev->empress_workqueue, empress_signal_update);
 
+        video_set_drvdata(dev->empress_dev, dev);
         err = video_register_device(dev->empress_dev,VFL_TYPE_GRABBER,
                                     empress_nr[dev->nr]);
         if (err < 0) {
diff --git a/drivers/media/video/saa7134/saa7134-video.c b/drivers/media/video/saa7134/saa7134-video.c
index 35f8daa3a359..bcca5a479817 100644
--- a/drivers/media/video/saa7134/saa7134-video.c
+++ b/drivers/media/video/saa7134/saa7134-video.c
@@ -1327,29 +1327,23 @@ static int saa7134_resource(struct saa7134_fh *fh)
 static int video_open(struct file *file)
 {
         int minor = video_devdata(file)->minor;
-        struct saa7134_dev *dev;
+        struct video_device *vdev = video_devdata(file);
+        struct saa7134_dev *dev = video_drvdata(file);
         struct saa7134_fh *fh;
-        enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        enum v4l2_buf_type type = 0;
         int radio = 0;
 
-        mutex_lock(&saa7134_devlist_lock);
-        list_for_each_entry(dev, &saa7134_devlist, devlist) {
-                if (dev->video_dev && (dev->video_dev->minor == minor))
-                        goto found;
-                if (dev->radio_dev && (dev->radio_dev->minor == minor)) {
-                        radio = 1;
-                        goto found;
-                }
-                if (dev->vbi_dev && (dev->vbi_dev->minor == minor)) {
-                        type = V4L2_BUF_TYPE_VBI_CAPTURE;
-                        goto found;
-                }
+        switch (vdev->vfl_type) {
+        case VFL_TYPE_GRABBER:
+                type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                break;
+        case VFL_TYPE_VBI:
+                type = V4L2_BUF_TYPE_VBI_CAPTURE;
+                break;
+        case VFL_TYPE_RADIO:
+                radio = 1;
+                break;
         }
-        mutex_unlock(&saa7134_devlist_lock);
-        return -ENODEV;
-
-found:
-        mutex_unlock(&saa7134_devlist_lock);
 
         dprintk("open minor=%d radio=%d type=%s\n",minor,radio,
                 v4l2_type_names[type]);