diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-25 12:39:54 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-25 12:39:54 +0200 |
| commit | ddb6d77848776ec7f6b3135f2dfa5fbc1544b003 (patch) | |
| tree | e4cdb2a470f816c0d4d5490fd011a1d8beb9bb05 /linux/include/media | |
| parent | c201b83b7aab962a7369b64863ba52ec2b973659 (diff) | |
| download | mediapointer-dvb-s2-ddb6d77848776ec7f6b3135f2dfa5fbc1544b003.tar.gz mediapointer-dvb-s2-ddb6d77848776ec7f6b3135f2dfa5fbc1544b003.tar.bz2 | |
videodev: remove some CONFIG_VIDEO_V4L1_COMPAT code from v4l2-dev.h
From: Hans Verkuil <hverkuil@xs4all.nl>
The video_device_create_file and video_device_remove_file functions can be
removed from v4l2-dev.h, removing the dependency on videodev.h in v4l2-dev.h.
Also removed a few more videodev.h includes that should have been videodev2.h.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/include/media')
| -rw-r--r-- | linux/include/media/v4l2-dev.h | 43 |
1 files changed, 0 insertions, 43 deletions
diff --git a/linux/include/media/v4l2-dev.h b/linux/include/media/v4l2-dev.h index 4609cc877..2f6c36309 100644 --- a/linux/include/media/v4l2-dev.h +++ b/linux/include/media/v4l2-dev.h @@ -16,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 */ @@ -106,45 +102,6 @@ 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> - -#if LINUX_VERSION_CODE < KERNEL_VERSION(2, 6, 19) -static inline int __must_check -video_device_create_file(struct video_device *vfd, - struct class_device_attribute *attr) -{ - int ret = class_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 class_device_attribute *attr) -{ - class_device_remove_file(&vfd->dev, attr); -} -#else -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 - -#endif /* CONFIG_VIDEO_V4L1_COMPAT */ - #ifdef OBSOLETE_DEVDATA /* to be removed soon */ /* helper functions to access driver private data. */ static inline void *video_get_drvdata(struct video_device *dev) |