lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

V4L/DVB (6812): media: video: usbvision: remove ctrlUrbLock

Browse Source 
The ctrlUrbLock has all it's users commented out, and so it's unused.  This
patch removes it.

Signed-off-by: Daniel Walker <dwalker@mvista.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Thierry MERLE <thierry.merle@free.fr>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
This commit is contained in:
Daniel Walker
2007-12-12 18:37:54 -03:00
committed by Mauro Carvalho Chehab
parent 544e617533
commit 1fe934ddfc
3 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/media/video/usbvision/usbvision-core.c
View File

@@ -1561,13 +1561,10 @@ static int usbvision_write_reg_irq(struct usb_usbvision *usbvision,int address,
if (len > 8) { if (len > 8) {
return -EFAULT; return -EFAULT;
} }
// down(&usbvision->ctrlUrbLock);
if (usbvision->ctrlUrbBusy) { if (usbvision->ctrlUrbBusy) {
// up(&usbvision->ctrlUrbLock);
return -EBUSY; return -EBUSY;
} }
usbvision->ctrlUrbBusy = 1; usbvision->ctrlUrbBusy = 1;
// up(&usbvision->ctrlUrbLock);
usbvision->ctrlUrbSetup.bRequestType = USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_ENDPOINT; usbvision->ctrlUrbSetup.bRequestType = USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_ENDPOINT;
usbvision->ctrlUrbSetup.bRequest = USBVISION_OP_CODE; usbvision->ctrlUrbSetup.bRequest = USBVISION_OP_CODE;

1
drivers/media/video/usbvision/usbvision-video.c
View File

@@ -1651,7 +1651,6 @@ static struct usb_usbvision *usbvision_alloc(struct usb_device *dev)
goto err_exit; goto err_exit;
} }
init_waitqueue_head(&usbvision->ctrlUrb_wq); init_waitqueue_head(&usbvision->ctrlUrb_wq);
init_MUTEX(&usbvision->ctrlUrbLock); /* to 1 == available */
usbvision_init_powerOffTimer(usbvision); usbvision_init_powerOffTimer(usbvision);

1
drivers/media/video/usbvision/usbvision.h
View File

@@ -370,7 +370,6 @@ struct usb_usbvision {
int ctrlUrbBusy; int ctrlUrbBusy;
struct usb_ctrlrequest ctrlUrbSetup; struct usb_ctrlrequest ctrlUrbSetup;
wait_queue_head_t ctrlUrb_wq; // Processes waiting wait_queue_head_t ctrlUrb_wq; // Processes waiting
struct semaphore ctrlUrbLock;
/* configuration part */ /* configuration part */
int have_tuner; int have_tuner;