The patch titled
MBCS: convert dmareadlock to mutex
has been added to the -mm tree. Its filename is
mbcs-convert-dmareadlock-to-mutex.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: MBCS: convert dmareadlock to mutex
From: Matthias Kaehlcke <matthias.kaehlcke@xxxxxxxxx>
MBCS: Convert the semaphore dmareadlock to the mutex API
Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/char/mbcs.c | 6 +++---
drivers/char/mbcs.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff -puN drivers/char/mbcs.c~mbcs-convert-dmareadlock-to-mutex drivers/char/mbcs.c
--- a/drivers/char/mbcs.c~mbcs-convert-dmareadlock-to-mutex
+++ a/drivers/char/mbcs.c
@@ -347,7 +347,7 @@ do_mbcs_sram_dmaread(struct mbcs_soft *s
{
int rv = 0;
- if (down_interruptible(&soft->dmareadlock))
+ if (mutex_lock_interruptible(&soft->dmareadlock))
return -ERESTARTSYS;
atomic_set(&soft->dmawrite_done, 0);
@@ -372,7 +372,7 @@ do_mbcs_sram_dmaread(struct mbcs_soft *s
*off += len;
dmaread_exit:
- up(&soft->dmareadlock);
+ mutex_unlock(&soft->dmareadlock);
return rv;
}
@@ -764,7 +764,7 @@ static int mbcs_probe(struct cx_dev *dev
init_waitqueue_head(&soft->algo_queue);
mutex_init(&soft->dmawritelock);
- init_MUTEX(&soft->dmareadlock);
+ mutex_init(&soft->dmareadlock);
mutex_init(&soft->algolock);
mbcs_getdma_init(&soft->getdma);
diff -puN drivers/char/mbcs.h~mbcs-convert-dmareadlock-to-mutex drivers/char/mbcs.h
--- a/drivers/char/mbcs.h~mbcs-convert-dmareadlock-to-mutex
+++ a/drivers/char/mbcs.h
@@ -538,7 +538,7 @@ struct mbcs_soft {
atomic_t dmaread_done;
atomic_t algo_done;
struct mutex dmawritelock;
- struct semaphore dmareadlock;
+ struct mutex dmareadlock;
struct mutex algolock;
};
_
Patches currently in -mm which might be from matthias.kaehlcke@xxxxxxxxx are
generic-ac97-mixer-modem-oss-use-list_for_each_entry.patch
mbcs-convert-algolock-to-mutex.patch
mbcs-convert-dmawritelock-to-mutex.patch
mbcs-convert-dmareadlock-to-mutex.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
