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>

4 files changed, 16 insertions, 39 deletions

diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 4ace70946d32..e7a68e2507de 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -2653,7 +2653,6 @@ static int em28xx_init_dev(struct em28xx **devhandle, struct usb_device *udev,
         INIT_LIST_HEAD(&dev->vbiq.active);
         INIT_LIST_HEAD(&dev->vbiq.queued);
 
-
         if (dev->board.has_msp34xx) {
                 /* Send a reset to other chips via gpio */
                 errCode = em28xx_write_reg(dev, EM28XX_R08_GPIO, 0xf7);
diff --git a/drivers/media/video/em28xx/em28xx-core.c b/drivers/media/video/em28xx/em28xx-core.c
index 4f61e05d30b4..b311d4514bdf 100644
--- a/drivers/media/video/em28xx/em28xx-core.c
+++ b/drivers/media/video/em28xx/em28xx-core.c
@@ -1136,34 +1136,6 @@ void em28xx_wake_i2c(struct em28xx *dev)
 static LIST_HEAD(em28xx_devlist);
 static DEFINE_MUTEX(em28xx_devlist_mutex);
 
-struct em28xx *em28xx_get_device(int minor,
-                                 enum v4l2_buf_type *fh_type,
-                                 int *has_radio)
-{
-        struct em28xx *h, *dev = NULL;
-
-        *fh_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-        *has_radio = 0;
-
-        mutex_lock(&em28xx_devlist_mutex);
-        list_for_each_entry(h, &em28xx_devlist, devlist) {
-                if (h->vdev->minor == minor)
-                        dev = h;
-                if (h->vbi_dev && h->vbi_dev->minor == minor) {
-                        dev = h;
-                        *fh_type = V4L2_BUF_TYPE_VBI_CAPTURE;
-                }
-                if (h->radio_dev &&
-                    h->radio_dev->minor == minor) {
-                        dev = h;
-                        *has_radio = 1;
-                }
-        }
-        mutex_unlock(&em28xx_devlist_mutex);
-
-        return dev;
-}
-
 /*
  * em28xx_realease_resources()
  * unregisters the v4l2,i2c and usb devices
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 9a8ff32cb31b..dd9bbe88c601 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -2082,16 +2082,24 @@ static int radio_queryctrl(struct file *file, void *priv,
 static int em28xx_v4l2_open(struct file *filp)
 {
         int minor = video_devdata(filp)->minor;
-        int errCode = 0, radio;
-        struct em28xx *dev;
-        enum v4l2_buf_type fh_type;
+        int errCode = 0, radio = 0;
+        struct video_device *vdev = video_devdata(filp);
+        struct em28xx *dev = video_drvdata(filp);
+        enum v4l2_buf_type fh_type = 0;
         struct em28xx_fh *fh;
         enum v4l2_field field;
 
-        dev = em28xx_get_device(minor, &fh_type, &radio);
-
-        if (NULL == dev)
-                return -ENODEV;
+        switch (vdev->vfl_type) {
+        case VFL_TYPE_GRABBER:
+                fh_type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+                break;
+        case VFL_TYPE_VBI:
+                fh_type = V4L2_BUF_TYPE_VBI_CAPTURE;
+                break;
+        case VFL_TYPE_RADIO:
+                radio = 1;
+                break;
+        }
 
         mutex_lock(&dev->lock);
 
@@ -2459,6 +2467,7 @@ static struct video_device *em28xx_vdev_init(struct em28xx *dev,
         snprintf(vfd->name, sizeof(vfd->name), "%s %s",
                  dev->name, type_name);
 
+        video_set_drvdata(vfd, dev);
         return vfd;
 }
 
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index 48977832316e..80d9b4fa1b97 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -668,9 +668,6 @@ int em28xx_gpio_set(struct em28xx *dev, struct em28xx_reg_seq *gpio);
 void em28xx_wake_i2c(struct em28xx *dev);
 void em28xx_remove_from_devlist(struct em28xx *dev);
 void em28xx_add_into_devlist(struct em28xx *dev);
-struct em28xx *em28xx_get_device(int minor,
-                                 enum v4l2_buf_type *fh_type,
-                                 int *has_radio);
 int em28xx_register_extension(struct em28xx_ops *dev);
 void em28xx_unregister_extension(struct em28xx_ops *dev);
 void em28xx_init_extension(struct em28xx *dev);