diff options
author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-07-17 23:50:58 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 06:17:52 -0400 |
commit | f87086e302300fdff1bd32049deb7a7f3e3de7da (patch) | |
tree | 27b42587cf577a63d9f79ccb27267e0dea7188cb /drivers/media/video/usbvision/usbvision-core.c | |
parent | e01117c81676dc9897f567e32cdc13a26e85280b (diff) |
v4l-dvb: remove legacy checks to allow support for kernels < 2.6.10
Also remove some blank lines that were used to split compat code at -devel
tree.
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'drivers/media/video/usbvision/usbvision-core.c')
-rw-r--r-- | drivers/media/video/usbvision/usbvision-core.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c index a9c5e5adba3a..abf685464b7c 100644 --- a/drivers/media/video/usbvision/usbvision-core.c +++ b/drivers/media/video/usbvision/usbvision-core.c | |||
@@ -169,7 +169,6 @@ static void usbvision_rvfree(void *mem, unsigned long size) | |||
169 | } | 169 | } |
170 | 170 | ||
171 | 171 | ||
172 | |||
173 | #if ENABLE_HEXDUMP | 172 | #if ENABLE_HEXDUMP |
174 | static void usbvision_hexdump(const unsigned char *data, int len) | 173 | static void usbvision_hexdump(const unsigned char *data, int len) |
175 | { | 174 | { |
@@ -2317,7 +2316,6 @@ static void usbvision_powerOffTimer(unsigned long data) | |||
2317 | del_timer(&usbvision->powerOffTimer); | 2316 | del_timer(&usbvision->powerOffTimer); |
2318 | INIT_WORK(&usbvision->powerOffWork, call_usbvision_power_off); | 2317 | INIT_WORK(&usbvision->powerOffWork, call_usbvision_power_off); |
2319 | (void) schedule_work(&usbvision->powerOffWork); | 2318 | (void) schedule_work(&usbvision->powerOffWork); |
2320 | |||
2321 | } | 2319 | } |
2322 | 2320 | ||
2323 | void usbvision_init_powerOffTimer(struct usb_usbvision *usbvision) | 2321 | void usbvision_init_powerOffTimer(struct usb_usbvision *usbvision) |
@@ -2518,7 +2516,6 @@ int usbvision_init_isoc(struct usb_usbvision *usbvision) | |||
2518 | } | 2516 | } |
2519 | } | 2517 | } |
2520 | 2518 | ||
2521 | |||
2522 | /* Submit all URBs */ | 2519 | /* Submit all URBs */ |
2523 | for (bufIdx = 0; bufIdx < USBVISION_NUMSBUF; bufIdx++) { | 2520 | for (bufIdx = 0; bufIdx < USBVISION_NUMSBUF; bufIdx++) { |
2524 | errCode = usb_submit_urb(usbvision->sbuf[bufIdx].urb, | 2521 | errCode = usb_submit_urb(usbvision->sbuf[bufIdx].urb, |
@@ -2564,7 +2561,6 @@ void usbvision_stop_isoc(struct usb_usbvision *usbvision) | |||
2564 | usbvision->sbuf[bufIdx].urb = NULL; | 2561 | usbvision->sbuf[bufIdx].urb = NULL; |
2565 | } | 2562 | } |
2566 | 2563 | ||
2567 | |||
2568 | PDEBUG(DBG_ISOC, "%s: streaming=Stream_Off\n", __func__); | 2564 | PDEBUG(DBG_ISOC, "%s: streaming=Stream_Off\n", __func__); |
2569 | usbvision->streaming = Stream_Off; | 2565 | usbvision->streaming = Stream_Off; |
2570 | 2566 | ||