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>

diff --git a/drivers/media/video/usbvision/usbvision-core.c b/drivers/media/video/usbvision/usbvision-core.c
index 2038d409f1dc66702c202f3b8baafe737352c204..9e404b87d000da0199f58bab99f1cc69a1b0578f 100644 (file)
--- a/drivers/media/video/usbvision/usbvision-core.c
+++ b/drivers/media/video/usbvision/usbvision-core.c
@@ -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;

diff --git a/drivers/media/video/usbvision/usbvision-video.c b/drivers/media/video/usbvision/usbvision-video.c
index 92e72910792b0ba582cc8078411e3fe769856f7d..b52b826a30be8b5fb38f03ed38de20dc3e338ee9 100644 (file)
--- a/drivers/media/video/usbvision/usbvision-video.c
+++ b/drivers/media/video/usbvision/usbvision-video.c
@@ -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);
 

diff --git a/drivers/media/video/usbvision/usbvision.h b/drivers/media/video/usbvision/usbvision.h
index dd80a98780f2046e48ee68aebcc60861014afcd7..20d7ec624999d677037dea1cb5ff26d8345ef71f 100644 (file)
--- a/drivers/media/video/usbvision/usbvision.h
+++ b/drivers/media/video/usbvision/usbvision.h
@@ -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;