aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorEzequiel GarcĂ­a <elezegarcia@gmail.com>2012-05-05 11:17:33 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-05-15 07:07:39 -0400
commitd2b30e9068577e15e432974ddf0862315ec2069c (patch)
treeedf6dcd83558ff241d73bf50b64bfd5465286796 /drivers
parentcd624c7b7ce3c3cfa09845dcefbe856bf9f9c4c6 (diff)
[media] em28xx: Remove unused wait_queue's
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>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c7
-rw-r--r--drivers/media/video/em28xx/em28xx-video.c1
-rw-r--r--drivers/media/video/em28xx/em28xx.h1
3 files changed, 0 insertions, 9 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index fcc713f8098d..20a7e24de6fb 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -2945,9 +2945,6 @@ static int em28xx_init_dev(struct em28xx *dev, struct usb_device *udev,
2945 dev->udev = udev; 2945 dev->udev = udev;
2946 mutex_init(&dev->ctrl_urb_lock); 2946 mutex_init(&dev->ctrl_urb_lock);
2947 spin_lock_init(&dev->slock); 2947 spin_lock_init(&dev->slock);
2948 init_waitqueue_head(&dev->open);
2949 init_waitqueue_head(&dev->wait_frame);
2950 init_waitqueue_head(&dev->wait_stream);
2951 2948
2952 dev->em28xx_write_regs = em28xx_write_regs; 2949 dev->em28xx_write_regs = em28xx_write_regs;
2953 dev->em28xx_read_reg = em28xx_read_reg; 2950 dev->em28xx_read_reg = em28xx_read_reg;
@@ -3385,8 +3382,6 @@ static void em28xx_usb_disconnect(struct usb_interface *interface)
3385 resources */ 3382 resources */
3386 mutex_lock(&dev->lock); 3383 mutex_lock(&dev->lock);
3387 3384
3388 wake_up_interruptible_all(&dev->open);
3389
3390 v4l2_device_disconnect(&dev->v4l2_dev); 3385 v4l2_device_disconnect(&dev->v4l2_dev);
3391 3386
3392 if (dev->users) { 3387 if (dev->users) {
@@ -3398,8 +3393,6 @@ static void em28xx_usb_disconnect(struct usb_interface *interface)
3398 dev->state |= DEV_MISCONFIGURED; 3393 dev->state |= DEV_MISCONFIGURED;
3399 em28xx_uninit_isoc(dev, dev->mode); 3394 em28xx_uninit_isoc(dev, dev->mode);
3400 dev->state |= DEV_DISCONNECTED; 3395 dev->state |= DEV_DISCONNECTED;
3401 wake_up_interruptible(&dev->wait_frame);
3402 wake_up_interruptible(&dev->wait_stream);
3403 } else { 3396 } else {
3404 dev->state |= DEV_DISCONNECTED; 3397 dev->state |= DEV_DISCONNECTED;
3405 em28xx_release_resources(dev); 3398 em28xx_release_resources(dev);
diff --git a/drivers/media/video/em28xx/em28xx-video.c b/drivers/media/video/em28xx/em28xx-video.c
index 308a1dd08cfb..1d4068052ef0 100644
--- a/drivers/media/video/em28xx/em28xx-video.c
+++ b/drivers/media/video/em28xx/em28xx-video.c
@@ -2284,7 +2284,6 @@ static int em28xx_v4l2_close(struct file *filp)
2284 videobuf_mmap_free(&fh->vb_vbiq); 2284 videobuf_mmap_free(&fh->vb_vbiq);
2285 kfree(fh); 2285 kfree(fh);
2286 dev->users--; 2286 dev->users--;
2287 wake_up_interruptible_nr(&dev->open, 1);
2288 return 0; 2287 return 0;
2289} 2288}
2290 2289
diff --git a/drivers/media/video/em28xx/em28xx.h b/drivers/media/video/em28xx/em28xx.h
index a3f77f6f5d95..8757523e6863 100644
--- a/drivers/media/video/em28xx/em28xx.h
+++ b/drivers/media/video/em28xx/em28xx.h
@@ -570,7 +570,6 @@ struct em28xx {
570 struct mutex ctrl_urb_lock; /* protects urb_buf */ 570 struct mutex ctrl_urb_lock; /* protects urb_buf */
571 /* spinlock_t queue_lock; */ 571 /* spinlock_t queue_lock; */
572 struct list_head inqueue, outqueue; 572 struct list_head inqueue, outqueue;
573 wait_queue_head_t open, wait_frame, wait_stream;
574 struct video_device *vbi_dev; 573 struct video_device *vbi_dev;
575 struct video_device *radio_dev; 574 struct video_device *radio_dev;
576 575