mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-30 05:15:03 +00:00
V4L/DVB (6812): media: video: usbvision: remove ctrlUrbLock
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:
parent
544e617533
commit
1fe934ddfc
drivers/media/video/usbvision
@ -1561,13 +1561,10 @@ static int usbvision_write_reg_irq(struct usb_usbvision *usbvision,int address,
|
||||
if (len > 8) {
|
||||
return -EFAULT;
|
||||
}
|
||||
// down(&usbvision->ctrlUrbLock);
|
||||
if (usbvision->ctrlUrbBusy) {
|
||||
// up(&usbvision->ctrlUrbLock);
|
||||
return -EBUSY;
|
||||
}
|
||||
usbvision->ctrlUrbBusy = 1;
|
||||
// up(&usbvision->ctrlUrbLock);
|
||||
|
||||
usbvision->ctrlUrbSetup.bRequestType = USB_DIR_OUT | USB_TYPE_VENDOR | USB_RECIP_ENDPOINT;
|
||||
usbvision->ctrlUrbSetup.bRequest = USBVISION_OP_CODE;
|
||||
|
@ -1651,7 +1651,6 @@ static struct usb_usbvision *usbvision_alloc(struct usb_device *dev)
|
||||
goto err_exit;
|
||||
}
|
||||
init_waitqueue_head(&usbvision->ctrlUrb_wq);
|
||||
init_MUTEX(&usbvision->ctrlUrbLock); /* to 1 == available */
|
||||
|
||||
usbvision_init_powerOffTimer(usbvision);
|
||||
|
||||
|
@ -370,7 +370,6 @@ struct usb_usbvision {
|
||||
int ctrlUrbBusy;
|
||||
struct usb_ctrlrequest ctrlUrbSetup;
|
||||
wait_queue_head_t ctrlUrb_wq; // Processes waiting
|
||||
struct semaphore ctrlUrbLock;
|
||||
|
||||
/* configuration part */
|
||||
int have_tuner;
|
||||
|
Loading…
Reference in New Issue
Block a user