[PATCH] v4l: 815: commented obsoleted stuff at videodev headers

- Commented obsoleted stuff at videodev headers.

Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 16a6d2da7391075d614b3c93b3612ce5786ec6fb..06644e230b471ea40fdcc044757d6adb3b306d88 100644 (file)
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -1671,7 +1671,6 @@ static int em2820_init_dev(struct em2820 **devhandle, struct usb_device *udev,
                return -ENOMEM;
        }
 
-       dev->vdev->owner = THIS_MODULE;
        dev->vdev->type = VID_TYPE_CAPTURE;
        if (dev->has_tuner)
                dev->vdev->type |= VID_TYPE_TUNER;

diff --git a/include/linux/videodev.h b/include/linux/videodev.h
index 23276cede54017fdb9cf2ece42b78d967fcc68b4..392592a040c544007c233e9d0859797f43fb456e 100644 (file)
--- a/include/linux/videodev.h
+++ b/include/linux/videodev.h
@@ -27,16 +27,6 @@ video_device_remove_file(struct video_device *vfd,
        class_device_remove_file(&vfd->class_dev, attr);
 }
 
-/* helper functions to access driver private data. */
-static inline void *video_get_drvdata(struct video_device *dev)
-{
-       return dev->priv;
-}
-
-static inline void video_set_drvdata(struct video_device *dev, void *data)
-{
-       dev->priv = data;
-}
 
 extern int video_exclusive_open(struct inode *inode, struct file *file);
 extern int video_exclusive_release(struct inode *inode, struct file *file);

diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h
index df0f9a24944a36010c8c1a4be3b4d7f9e93c088b..65829a510aca85411ac6e5fcfd3bd41a0bf36943 100644 (file)
--- a/include/linux/videodev2.h
+++ b/include/linux/videodev2.h
@@ -50,13 +50,6 @@ struct video_device
        void (*release)(struct video_device *vfd);
 
 
-       /* obsolete -- fops->owner is used instead */
-       struct module *owner;
-       /* dev->driver_data will be used instead some day.
-        * Use the video_{get|set}_drvdata() helper functions,
-        * so the switch over will be transparent for you.
-        * Or use {pci|usb}_{get|set}_drvdata() directly. */
-       void *priv;
 
        /* for videodev.c intenal usage -- please don't touch */
        int users;                     /* video_exclusive_{open|close} ... */