From: matthias@kaehlcke.net
To: wolfgang@iksw-muees.de, linux-usb@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, akpm@linux-foundation.org,
Matthias Kaehlcke <matthias@kaehlcke.net>
Subject: [patch 2/3] Convert ccp->readmutex in a mutex
Date: Mon, 18 Feb 2008 20:45:35 +0100 [thread overview]
Message-ID: <20080218194533.903955589@kaehlcke.net> (raw)
In-Reply-To: <20080218194533.185137318@kaehlcke.net>
[-- Attachment #1: usb-misc-auerswald-ccp_readmutex-to-mutex.diff --]
[-- Type: text/plain, Size: 3215 bytes --]
The semaphore ccp->readmutex is used as mutex, convert it to the mutex API
Signed-off-by: Matthias Kaehlcke <matthias@kaehlcke.net>
Index: linux-2.6/drivers/usb/misc/auerswald.c
===================================================================
--- linux-2.6.orig/drivers/usb/misc/auerswald.c 2008-02-18 20:12:55.000000000 +0100
+++ linux-2.6/drivers/usb/misc/auerswald.c 2008-02-18 20:10:00.000000000 +0100
@@ -259,7 +259,7 @@
auerbufctl_t bufctl; /* controls the buffer chain */
auerscon_t scontext; /* service context */
wait_queue_head_t readwait; /* for synchronous reading */
- struct semaphore readmutex; /* protection against multiple reads */
+ struct mutex readmutex; /* protection against multiple reads */
pauerbuf_t readbuf; /* buffer held for partial reading */
unsigned int readoffset; /* current offset in readbuf */
unsigned int removed; /* is != 0 if device is removed */
@@ -1391,7 +1391,7 @@
/* Initialize device descriptor */
init_MUTEX( &ccp->mutex);
- init_MUTEX( &ccp->readmutex);
+ mutex_init(&ccp->readmutex);
auerbuf_init (&ccp->bufctl);
ccp->scontext.id = AUH_UNASSIGNED;
ccp->scontext.dispatch = auerchar_ctrlread_dispatch;
@@ -1585,7 +1585,7 @@
}
/* only one reader per device allowed */
- if (down_interruptible (&ccp->readmutex)) {
+ if (mutex_lock_interruptible(&ccp->readmutex)) {
up (&ccp->mutex);
return -ERESTARTSYS;
}
@@ -1603,7 +1603,7 @@
if (count) {
if (copy_to_user (buf, bp->bufp+ccp->readoffset, count)) {
dbg ("auerswald_read: copy_to_user failed");
- up (&ccp->readmutex);
+ mutex_unlock(&ccp->readmutex);
up (&ccp->mutex);
return -EFAULT;
}
@@ -1618,7 +1618,7 @@
}
/* return with number of bytes read */
if (count) {
- up (&ccp->readmutex);
+ mutex_unlock(&ccp->readmutex);
up (&ccp->mutex);
return count;
}
@@ -1655,7 +1655,7 @@
dbg ("No read buffer available, returning -EAGAIN");
set_current_state (TASK_RUNNING);
remove_wait_queue (&ccp->readwait, &wait);
- up (&ccp->readmutex);
+ mutex_unlock(&ccp->readmutex);
up (&ccp->mutex);
return -EAGAIN; /* nonblocking, no data available */
}
@@ -1666,18 +1666,18 @@
remove_wait_queue (&ccp->readwait, &wait);
if (signal_pending (current)) {
/* waked up by a signal */
- up (&ccp->readmutex);
+ mutex_unlock(&ccp->readmutex);
return -ERESTARTSYS;
}
/* Anything left to read? */
if ((ccp->scontext.id == AUH_UNASSIGNED) || ccp->removed) {
- up (&ccp->readmutex);
+ mutex_unlock(&ccp->readmutex);
return -EIO;
}
if (down_interruptible (&ccp->mutex)) {
- up (&ccp->readmutex);
+ mutex_unlock(&ccp->readmutex);
return -ERESTARTSYS;
}
--
Matthias Kaehlcke
Linux System Developer
Barcelona
We build too many walls and not enough bridges
(Isaac Newton)
.''`.
using free software / Debian GNU/Linux | http://debian.org : :' :
`. `'`
gpg --keyserver pgp.mit.edu --recv-keys 47D8E5D4 `-
next prev parent reply other threads:[~2008-02-18 20:49 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-02-18 19:45 [patch 0/3] USB Auerswald ISDN: Convert semaphores to mutexes matthias
2008-02-18 19:45 ` [patch 1/3] Convert stats_sem in a mutex matthias
2008-02-18 19:45 ` matthias [this message]
2008-02-19 17:23 ` [patch 2/3] Convert ccp->readmutex " Daniel Walker
2008-02-18 19:45 ` [patch 3/3] Convert ccp->mutex " matthias
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=20080218194533.903955589@kaehlcke.net \
--to=matthias@kaehlcke.net \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=wolfgang@iksw-muees.de \
/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
all inboxes | Powered by JetHome®