summaryrefslogtreecommitdiff
path: root/linux/drivers/media/video/pwc/pwc-if.c
diff options
context:
space:
mode:
authorHans Verkuil <hverkuil@xs4all.nl>2008-07-08 01:17:00 +0200
committerHans Verkuil <hverkuil@xs4all.nl>2008-07-08 01:17:00 +0200
commit1e35850ac2509c324478d38091880e60ab28795f (patch)
treeffb89f595c6bcea9189a5f090fad092c8aa7428e /linux/drivers/media/video/pwc/pwc-if.c
parent7ce87336c2f386ab6c35e985a5832d21b5cd7fab (diff)
downloadmediapointer-dvb-s2-1e35850ac2509c324478d38091880e60ab28795f.tar.gz
mediapointer-dvb-s2-1e35850ac2509c324478d38091880e60ab28795f.tar.bz2
v4l-dvb: remove support for kernels < 2.6.10
From: Hans Verkuil <hverkuil@xs4all.nl> Phase 2 removes support for kernels < 2.6.10. Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Diffstat (limited to 'linux/drivers/media/video/pwc/pwc-if.c')
-rw-r--r--linux/drivers/media/video/pwc/pwc-if.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/linux/drivers/media/video/pwc/pwc-if.c b/linux/drivers/media/video/pwc/pwc-if.c
index 8236b2b2d..0ac103a8c 100644
--- a/linux/drivers/media/video/pwc/pwc-if.c
+++ b/linux/drivers/media/video/pwc/pwc-if.c
@@ -830,13 +830,9 @@ int pwc_isoc_init(struct pwc_device *pdev)
/* Get the current alternate interface, adjust packet size */
if (!udev->actconfig)
return -EFAULT;
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,5)
- idesc = &udev->actconfig->interface[0]->altsetting[pdev->valternate];
-#else
intf = usb_ifnum_to_if(udev, 0);
if (intf)
idesc = usb_altnum_to_altsetting(intf, pdev->valternate);
-#endif
if (!idesc)
return -EFAULT;
@@ -1472,15 +1468,9 @@ static int pwc_video_mmap(struct file *file, struct vm_area_struct *vma)
pos += (unsigned long)pdev->image_data;
while (size > 0) {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
- page = kvirt_to_pa(pos);
- if (remap_page_range(vma, start, page, PAGE_SIZE, PAGE_SHARED))
- return -EAGAIN;
-#else
page = vmalloc_to_pfn((void *)pos);
if (remap_pfn_range(vma, start, page, PAGE_SIZE, PAGE_SHARED))
return -EAGAIN;
-#endif
start += PAGE_SIZE;
pos += PAGE_SIZE;
if (size > PAGE_SIZE)
@@ -1943,13 +1933,8 @@ module_param_named(trace, pwc_trace, int, 0644);
#endif
module_param(power_save, int, 0444);
module_param(compression, int, 0444);
-#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,10)
-module_param_array(leds, int, leds_nargs, 0444);
-module_param_array(dev_hint, charp, dev_hint_nargs, 0444);
-#else
module_param_array(leds, int, &leds_nargs, 0444);
module_param_array(dev_hint, charp, &dev_hint_nargs, 0444);
-#endif
MODULE_PARM_DESC(size, "Initial image size. One of sqcif, qsif, qcif, sif, cif, vga");
MODULE_PARM_DESC(fps, "Initial frames per second. Varies with model, useful range 5-30");