summaryrefslogtreecommitdiffstats
path: root/include/media/v4l2-dev.h
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-07-25 07:39:54 -0300
committerMauro Carvalho Chehab <mchehab@infradead.org>2008-07-26 13:18:11 -0300
commitf894dfd735237548d282d6fd55b6ebb4b2fd9ef2 (patch)
treebf7313318e8653d82ddfd001de742c48e93f1f9d /include/media/v4l2-dev.h
parent668acf32dfa1f1a975213f77bf17ee435f5a8edd (diff)
downloadop-kernel-dev-f894dfd735237548d282d6fd55b6ebb4b2fd9ef2.zip
op-kernel-dev-f894dfd735237548d282d6fd55b6ebb4b2fd9ef2.tar.gz
V4L/DVB (8488): videodev: remove some CONFIG_VIDEO_V4L1_COMPAT code from v4l2-dev.h
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> Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'include/media/v4l2-dev.h')
-rw-r--r--include/media/v4l2-dev.h25
1 files changed, 0 insertions, 25 deletions
diff --git a/include/media/v4l2-dev.h b/include/media/v4l2-dev.h
index ae2b1e6..2fe3885 100644
--- a/include/media/v4l2-dev.h
+++ b/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 */
@@ -102,27 +98,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>
-
-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_DEVDATA /* to be removed soon */
/* helper functions to access driver private data. */
static inline void *video_get_drvdata(struct video_device *dev)
OpenPOWER on IntegriCloud