From ea33affdbd8d71fab71e3f62845b9239d6f60ff8 Mon Sep 17 00:00:00 2001 From: Hans Verkuil Date: Tue, 8 Jul 2008 08:26:19 +0200 Subject: v4l-dvb: remove support for kernels < 2.6.13 From: Hans Verkuil Phase 3 of the compat cleanup. Signed-off-by: Hans Verkuil --- linux/drivers/media/video/pwc/pwc-if.c | 13 ------------- linux/drivers/media/video/pwc/pwc-ioctl.h | 5 ----- 2 files changed, 18 deletions(-) (limited to 'linux/drivers/media/video/pwc') diff --git a/linux/drivers/media/video/pwc/pwc-if.c b/linux/drivers/media/video/pwc/pwc-if.c index 0ac103a8c..c28490ae5 100644 --- a/linux/drivers/media/video/pwc/pwc-if.c +++ b/linux/drivers/media/video/pwc/pwc-if.c @@ -841,11 +841,7 @@ int pwc_isoc_init(struct pwc_device *pdev) pdev->vmax_packet_size = -1; for (i = 0; i < idesc->desc.bNumEndpoints; i++) { if ((idesc->endpoint[i].desc.bEndpointAddress & 0xF) == pdev->vendpoint) { -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11) - pdev->vmax_packet_size = idesc->endpoint[i].desc.wMaxPacketSize; -#else pdev->vmax_packet_size = le16_to_cpu(idesc->endpoint[i].desc.wMaxPacketSize); -#endif break; } } @@ -1498,13 +1494,8 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id int video_nr = -1; /* default: use next available device */ char serial_number[30], *name; -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11) - vendor_id = udev->descriptor.idVendor; - product_id = udev->descriptor.idProduct; -#else vendor_id = le16_to_cpu(udev->descriptor.idVendor); product_id = le16_to_cpu(udev->descriptor.idProduct); -#endif /* Check if we can handle this device */ PWC_DEBUG_PROBE("probe() called [%04X %04X], if %d\n", @@ -1785,11 +1776,7 @@ static int usb_pwc_probe(struct usb_interface *intf, const struct usb_device_id pdev->vdev->owner = THIS_MODULE; video_set_drvdata(pdev->vdev, pdev); -#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,11) - pdev->release = udev->descriptor.bcdDevice; -#else pdev->release = le16_to_cpu(udev->descriptor.bcdDevice); -#endif PWC_DEBUG_PROBE("Release: %04x\n", pdev->release); /* Now search device_hint[] table for a match, so we can hint a node number. */ diff --git a/linux/drivers/media/video/pwc/pwc-ioctl.h b/linux/drivers/media/video/pwc/pwc-ioctl.h index 58904acda..8c0cae7b3 100644 --- a/linux/drivers/media/video/pwc/pwc-ioctl.h +++ b/linux/drivers/media/video/pwc/pwc-ioctl.h @@ -54,11 +54,6 @@ #include #include -#if LINUX_VERSION_CODE <= KERNEL_VERSION(2, 6, 10) -/* Compatibility for older kernel */ -typedef __u16 __le16; -#endif - /* Enumeration of image sizes */ #define PSZ_SQCIF 0x00 #define PSZ_QSIF 0x01 -- cgit v1.2.3