[media] em28xx: Remove unused wait_queue's
authorEzequiel García <elezegarcia@gmail.com>
Sat, 5 May 2012 15:17:33 +0000 (12:17 -0300)
committerMauro Carvalho Chehab <mchehab@redhat.com>
Tue, 15 May 2012 11:07:39 +0000 (08:07 -0300)
Nobody ever waits on any of these wait_queue's,
so this patch removes them completely.
Tested by compilation only.

Signed-off-by: Ezequiel Garcia <elezegarcia@gmail.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
drivers/media/video/em28xx/em28xx-cards.c
drivers/media/video/em28xx/em28xx-video.c
drivers/media/video/em28xx/em28xx.h

index fcc713f8098d44713f3e57426755950e1b1ca2a4..20a7e24de6fba66e3ce806153a3dda5995c34fed 100644 (file)
@@ -2945,9 +2945,6 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,
        dev->udev = udev;
        mutex_init(&dev->ctrl_urb_lock);
        spin_lock_init(&dev->slock);
-       init_waitqueue_head(&dev->open);
-       init_waitqueue_head(&dev->wait_frame);
-       init_waitqueue_head(&dev->wait_stream);
 
        dev->em28xx_write_regs = em28xx_write_regs;
        dev->em28xx_read_reg = em28xx_read_reg;
@@ -3385,8 +3382,6 @@ static void em28xx_usb_disconnect(struct usb_interface *interface)
           resources */
        mutex_lock(&dev->lock);
 
-       wake_up_interruptible_all(&dev->open);
-
        v4l2_device_disconnect(&dev->v4l2_dev);
 
        if (dev->users) {
@@ -3398,8 +3393,6 @@ static void em28xx_usb_disconnect(struct usb_interface *interface)
                dev->state |= DEV_MISCONFIGURED;
                em28xx_uninit_isoc(dev, dev->mode);
                dev->state |= DEV_DISCONNECTED;
-               wake_up_interruptible(&dev->wait_frame);
-               wake_up_interruptible(&dev->wait_stream);
        } else {
                dev->state |= DEV_DISCONNECTED;
                em28xx_release_resources(dev);
index 308a1dd08cfba9e086b812bf7bc37e561cbe2636..1d4068052ef0046ead8c5ac0c877a2bd56f354e0 100644 (file)
@@ -2284,7 +2284,6 @@ static int em28xx_v4l2_close(struct file *filp)
        videobuf_mmap_free(&fh->vb_vbiq);
        kfree(fh);
        dev->users--;
-       wake_up_interruptible_nr(&dev->open, 1);
        return 0;
 }
 
index a3f77f6f5d95c17bfd1a23e39cdc733a7d08a8b4..8757523e686363d79252878a6bb6d8d64d79cb39 100644 (file)
@@ -570,7 +570,6 @@ struct em28xx {
        struct mutex ctrl_urb_lock;     /* protects urb_buf */
        /* spinlock_t queue_lock; */
        struct list_head inqueue, outqueue;
-       wait_queue_head_t open, wait_frame, wait_stream;
        struct video_device *vbi_dev;
        struct video_device *radio_dev;