summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/usbvideo
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-07-08 17:40:58 +0200
committerHans Verkuil <hverkuil@xs4all.nl>2008-07-08 17:40:58 +0200
commite9314ad63401c89bffe82b165eb7ae630c05a75d (patch)
treeb31a77f9ccfea646348025aae7452e900e61a761 /linux/drivers/media/video/usbvideo
parentd784aba6717da44bfef18007146f6d00280e39fe (diff)
downloadmediapointer-dvb-s2-e9314ad63401c89bffe82b165eb7ae630c05a75d.tar.gz
mediapointer-dvb-s2-e9314ad63401c89bffe82b165eb7ae630c05a75d.tar.bz2
v4l-dvb: remove support for kernels < 2.6.16
From: Hans Verkuil <hverkuil@xs4all.nl> Phase 4 removes the compatibility support for kernels < 2.6.16. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/usbvideo')
-rw-r--r--linux/drivers/media/video/usbvideo/konicawc.c4
-rw-r--r--linux/drivers/media/video/usbvideo/quickcam_messenger.c4
-rw-r--r--linux/drivers/media/video/usbvideo/usbvideo.h10
-rw-r--r--linux/drivers/media/video/usbvideo/vicam.c6
4 files changed, 0 insertions, 24 deletions
diff --git a/linux/drivers/media/video/usbvideo/konicawc.c b/linux/drivers/media/video/usbvideo/konicawc.c
index 6fef59557..25f9b4286 100644
--- a/linux/drivers/media/video/usbvideo/konicawc.c
+++ b/linux/drivers/media/video/usbvideo/konicawc.c
@@ -244,11 +244,7 @@ static void konicawc_register_input(struct konicawc *cam, struct usb_device *dev
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
input_dev->dev.parent = &dev->dev;
#else
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
input_dev->cdev.dev = &dev->dev;
-#else
- input_dev->dev = &dev->dev;
-#endif
#endif
input_dev->evbit[0] = BIT_MASK(EV_KEY);
diff --git a/linux/drivers/media/video/usbvideo/quickcam_messenger.c b/linux/drivers/media/video/usbvideo/quickcam_messenger.c
index 69f0fc770..f079e8d66 100644
--- a/linux/drivers/media/video/usbvideo/quickcam_messenger.c
+++ b/linux/drivers/media/video/usbvideo/quickcam_messenger.c
@@ -108,11 +108,7 @@ static void qcm_register_input(struct qcm *cam, struct usb_device *dev)
#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
input_dev->dev.parent = &dev->dev;
#else
-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
input_dev->cdev.dev = &dev->dev;
-#else
- input_dev->dev = &dev->dev;
-#endif
#endif
input_dev->evbit[0] = BIT_MASK(EV_KEY);
diff --git a/linux/drivers/media/video/usbvideo/usbvideo.h b/linux/drivers/media/video/usbvideo/usbvideo.h
index c1f892825..03b3add3d 100644
--- a/linux/drivers/media/video/usbvideo/usbvideo.h
+++ b/linux/drivers/media/video/usbvideo/usbvideo.h
@@ -19,9 +19,7 @@
#include <linux/videodev.h>
#include <media/v4l2-common.h>
#include <linux/usb.h>
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
#include <linux/mutex.h>
-#endif
#include "compat.h"
/* Most helpful debugging aid */
@@ -217,11 +215,7 @@ struct uvd {
unsigned long flags; /* FLAGS_USBVIDEO_xxx */
unsigned long paletteBits; /* Which palettes we accept? */
unsigned short defaultPalette; /* What palette to use for read() */
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
struct mutex lock;
-#else
- struct semaphore lock;
-#endif
int user; /* user count for exclusive use */
videosize_t videosize; /* Current setting */
@@ -280,11 +274,7 @@ struct usbvideo {
int num_cameras; /* As allocated */
struct usb_driver usbdrv; /* Interface to the USB stack */
char drvName[80]; /* Driver name */
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
struct mutex lock; /* Mutex protecting camera structures */
-#else
- struct semaphore lock;
-#endif
struct usbvideo_cb cb; /* Table of callbacks (virtual methods) */
struct video_device vdt; /* Video device template */
struct uvd *cam; /* Array of camera structures */
diff --git a/linux/drivers/media/video/usbvideo/vicam.c b/linux/drivers/media/video/usbvideo/vicam.c
index 049f588ae..17f542dfb 100644
--- a/linux/drivers/media/video/usbvideo/vicam.c
+++ b/linux/drivers/media/video/usbvideo/vicam.c
@@ -42,9 +42,7 @@
#include <linux/usb.h>
#include <linux/vmalloc.h>
#include <linux/slab.h>
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
#include <linux/mutex.h>
-#endif
#include "usbvideo.h"
// #define VICAM_DEBUG
@@ -406,11 +404,7 @@ struct vicam_camera {
struct usb_device *udev; // usb device
/* guard against simultaneous accesses to the camera */
-#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
struct mutex cam_lock;
-#else
- struct semaphore cam_lock;
-#endif
int is_initialized;
u8 open_count;