[media] media/usbvision: remove ctrl_urb_wq

While the wakeup path seems to be set up, this waitqueue is actually
never used as no-one enqueues themselves on the list. As such, wakeups
are meaningless without waiters, so lets just get rid of the whole
thing.

Signed-off-by: Davidlohr Bueso <dbueso@suse.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/usb/usbvision/usbvision-core.c b/drivers/media/usb/usbvision/usbvision-core.c
index 0af7130..3f87fbc 100644 (file)
--- a/drivers/media/usb/usbvision/usbvision-core.c
+++ b/drivers/media/usb/usbvision/usbvision-core.c
@@ -1413,8 +1413,6 @@ static void usbvision_ctrl_urb_complete(struct urb *urb)
 
        PDEBUG(DBG_IRQ, "");
        usbvision->ctrl_urb_busy = 0;
-       if (waitqueue_active(&usbvision->ctrl_urb_wq))
-               wake_up_interruptible(&usbvision->ctrl_urb_wq);
 }
 
 

diff --git a/drivers/media/usb/usbvision/usbvision-video.c b/drivers/media/usb/usbvision/usbvision-video.c
index b88fed3..f5c635a 100644 (file)
--- a/drivers/media/usb/usbvision/usbvision-video.c
+++ b/drivers/media/usb/usbvision/usbvision-video.c
@@ -1336,7 +1336,6 @@ static struct usb_usbvision *usbvision_alloc(struct usb_device *dev,
        usbvision->ctrl_urb = usb_alloc_urb(USBVISION_URB_FRAMES, GFP_KERNEL);
        if (usbvision->ctrl_urb == NULL)
                goto err_unreg;
-       init_waitqueue_head(&usbvision->ctrl_urb_wq);
 
        return usbvision;
 

diff --git a/drivers/media/usb/usbvision/usbvision.h b/drivers/media/usb/usbvision/usbvision.h
index 56a28d6..6ecdcd5 100644 (file)
--- a/drivers/media/usb/usbvision/usbvision.h
+++ b/drivers/media/usb/usbvision/usbvision.h
@@ -366,7 +366,6 @@ struct usb_usbvision {
        unsigned char ctrl_urb_buffer[8];
        int ctrl_urb_busy;
        struct usb_ctrlrequest ctrl_urb_setup;
-       wait_queue_head_t ctrl_urb_wq;                                  /* Processes waiting */
 
        /* configuration part */
        int have_tuner;