loopback: Drop obsolete ip_summed setting

[linux-2.6] / include / media / v4l2-dev.h

diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index d9149cd25b31767fa5d73f23eee7006b1aa32848..2745e1afc72267f7be541e7c52ea05371d33d451 100644 (file)
--- a/include/media/v4l2-dev.h
+++ b/include/media/v4l2-dev.h
@@ -9,7 +9,6 @@
 #ifndef _V4L2_DEV_H
 #define _V4L2_DEV_H
 
-#define OBSOLETE_OWNER   1 /* to be removed soon */
 #define OBSOLETE_DEVDATA 1 /* to be removed soon */
 
 #include <linux/poll.h>
@@ -17,11 +16,7 @@
 #include <linux/device.h>
 #include <linux/mutex.h>
 #include <linux/compiler.h> /* need __user */
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-#include <linux/videodev.h>
-#else
 #include <linux/videodev2.h>
-#endif
 
 #define VIDEO_MAJOR    81
 /* Minor device allocation */
@@ -58,10 +53,9 @@ struct video_device
 
        /* device info */
        char name[32];
-       int type;                       /* v4l1 */
-       int type2;                      /* v4l2 */
+       int vfl_type;
        int minor;
-       /* attribute to diferentiate multiple indexs on one physical device */
+       /* attribute to differentiate multiple indices on one physical device */
        int index;
 
        int debug;                      /* Activates debug level*/
@@ -76,17 +70,15 @@ struct video_device
        /* ioctl callbacks */
        const struct v4l2_ioctl_ops *ioctl_ops;
 
-#ifdef OBSOLETE_OWNER /* to be removed soon */
-/* 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;
+#ifdef OBSOLETE_DEVDATA /* to be removed soon */
+       /* 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;
 #endif
 
-       /* for videodev.c intenal usage -- please don't touch */
+       /* for videodev.c internal usage -- please don't touch */
        int users;                     /* video_exclusive_{open|close} ... */
        struct mutex lock;             /* ... helper function uses these   */
 };
@@ -105,28 +97,7 @@ void video_unregister_device(struct video_device *);
 struct video_device *video_device_alloc(void);
 void video_device_release(struct video_device *vfd);
 
-#ifdef CONFIG_VIDEO_V4L1_COMPAT
-#include <linux/mm.h>
-
-static inline int __must_check
-video_device_create_file(struct video_device *vfd,
-                        struct device_attribute *attr)
-{
-       int ret = device_create_file(&vfd->dev, attr);
-       if (ret < 0)
-               printk(KERN_WARNING "%s error: %d\n", __func__, ret);
-       return ret;
-}
-static inline void
-video_device_remove_file(struct video_device *vfd,
-                        struct device_attribute *attr)
-{
-       device_remove_file(&vfd->dev, attr);
-}
-
-#endif /* CONFIG_VIDEO_V4L1_COMPAT */
-
-#ifdef OBSOLETE_OWNER /* to be removed soon */
+#ifdef OBSOLETE_DEVDATA /* to be removed soon */
 /* helper functions to access driver private data. */
 static inline void *video_get_drvdata(struct video_device *dev)
 {
@@ -138,9 +109,6 @@ static inline void video_set_drvdata(struct video_device *dev, void *data)
        dev->priv = data;
 }
 
-#endif
-
-#ifdef OBSOLETE_DEVDATA /* to be removed soon */
 /* Obsolete stuff - Still needed for radio devices and obsolete drivers */
 extern struct video_device* video_devdata(struct file*);
 extern int video_exclusive_open(struct inode *inode, struct file *file);