From: Daniel Walker <dwalker@mvista.com>
To: akpm@linux-foundation.org
Cc: linux-kernel@vger.kernel.org, mingo@elte.hu, linux@bohmer.net,
jonathan@jonmasters.org, matthias.kaehlcke@gmail.com,
kjwinchester@gmail.com
Subject: [PATCH 1/4] media: video: usbvision: remove ctrlUrbLock
Date: Fri, 07 Dec 2007 00:00:01 -0800 [thread overview]
Message-ID: <20071208025620.470633411@mvista.com> (raw)
Message-ID: <20071208025608.631609481@mvista.com> (raw)
[-- Attachment #1: usbvision-video-remove-CtrlUrbLock.patch --]
[-- Type: text/plain, Size: 2081 bytes --]
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>
---
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(-)
Index: linux-2.6.23/drivers/media/video/usbvision/usbvision-core.c
===================================================================
--- linux-2.6.23.orig/drivers/media/video/usbvision/usbvision-core.c
+++ linux-2.6.23/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;
Index: linux-2.6.23/drivers/media/video/usbvision/usbvision-video.c
===================================================================
--- linux-2.6.23.orig/drivers/media/video/usbvision/usbvision-video.c
+++ linux-2.6.23/drivers/media/video/usbvision/usbvision-video.c
@@ -1650,7 +1650,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);
Index: linux-2.6.23/drivers/media/video/usbvision/usbvision.h
===================================================================
--- linux-2.6.23.orig/drivers/media/video/usbvision/usbvision.h
+++ linux-2.6.23/drivers/media/video/usbvision/usbvision.h
@@ -374,7 +374,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;
--
next reply other threads:[~2007-12-08 3:08 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20071208025608.631609481@mvista.com>
2007-12-07 8:00 ` Daniel Walker [this message]
2007-12-07 8:00 ` [PATCH 2/4] docs: kernel-locking: Convert semaphore references Daniel Walker
2007-12-07 8:00 ` [PATCH 3/4] mcheck mce_64: mce_read_sem to mutex Daniel Walker
2007-12-07 8:00 ` [PATCH 4/4] md: dm driver: suspend_lock semaphore " Daniel Walker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20071208025620.470633411@mvista.com \
--to=dwalker@mvista.com \
--cc=akpm@linux-foundation.org \
--cc=jonathan@jonmasters.org \
--cc=kjwinchester@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@bohmer.net \
--cc=matthias.kaehlcke@gmail.com \
--cc=mingo@elte.hu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox