The patch titled media: video: usbvision: remove ctrlUrbLock has been removed from the -mm tree. Its filename was media-video-usbvision-remove-ctrlurblock.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: media: video: usbvision: remove ctrlUrbLock From: Daniel Walker <dwalker@xxxxxxxxxx> The ctrlUrbLock has all it's users commented out, and so it's unused. This patch removes it. Signed-off-by: Daniel Walker <dwalker@xxxxxxxxxx> Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/media/video/usbvision/usbvision-core.c | 3 --- drivers/media/video/usbvision/usbvision-video.c | 1 - drivers/media/video/usbvision/usbvision.h | 1 - 3 files changed, 5 deletions(-) diff -puN drivers/media/video/usbvision/usbvision-core.c~media-video-usbvision-remove-ctrlurblock drivers/media/video/usbvision/usbvision-core.c --- a/drivers/media/video/usbvision/usbvision-core.c~media-video-usbvision-remove-ctrlurblock +++ a/drivers/media/video/usbvision/usbvision-core.c @@ -1561,13 +1561,10 @@ static int usbvision_write_reg_irq(struc 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 -puN drivers/media/video/usbvision/usbvision.h~media-video-usbvision-remove-ctrlurblock drivers/media/video/usbvision/usbvision.h --- a/drivers/media/video/usbvision/usbvision.h~media-video-usbvision-remove-ctrlurblock +++ a/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; diff -puN drivers/media/video/usbvision/usbvision-video.c~media-video-usbvision-remove-ctrlurblock drivers/media/video/usbvision/usbvision-video.c --- a/drivers/media/video/usbvision/usbvision-video.c~media-video-usbvision-remove-ctrlurblock +++ a/drivers/media/video/usbvision/usbvision-video.c @@ -1651,7 +1651,6 @@ static struct usb_usbvision *usbvision_a goto err_exit; } init_waitqueue_head(&usbvision->ctrlUrb_wq); - init_MUTEX(&usbvision->ctrlUrbLock); /* to 1 == available */ usbvision_init_powerOffTimer(usbvision); _ Patches currently in -mm which might be from dwalker@xxxxxxxxxx are git-dvb.patch usb-testing-driver-dont-free-a-locked-mutex.patch mcheck-mce_64-mce_read_sem-to-mutex.patch drivers-char-tty_ioc-remove-pty_sem.patch drivers-isdn-i4l-isdn_ttyc-remove-write_sem.patch unix98-allocated_ptys_lock-semaphore-to-mutex.patch docs-kernel-locking-convert-semaphore-references.patch stopmachine-semaphore-to-mutex.patch stopmachine-semaphore-to-mutex-fix.patch amiga-serial-driver-port_write_mutex-fixup.patch isapnp-driver-semaphore-to-mutex.patch isapnp-driver-semaphore-to-mutex-fix.patch isapnp-driver-semaphore-to-mutex-fix-fix.patch profile-likely-unlikely-macros.patch profile-likely-unlikely-macros-fix.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html