Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ae5e29798afa2b11a01fcb4fab8b58fee47fe155
Commit: ae5e29798afa2b11a01fcb4fab8b58fee47fe155
Parent: 46bca69682731104b42f99da763b9a08a0574291
Author: Matthias Kaehlcke <[EMAIL PROTECTED]>
AuthorDate: Thu Feb 7 00:15:25 2008 -0800
Committer: Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Thu Feb 7 08:42:25 2008 -0800
MBCS: convert dmareadlock to mutex
MBCS: Convert the semaphore dmareadlock to the mutex API
Signed-off-by: Matthias Kaehlcke <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
drivers/char/mbcs.c | 6 +++---
drivers/char/mbcs.h | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c
index 7321c14..f4716ad 100644
--- a/drivers/char/mbcs.c
+++ b/drivers/char/mbcs.c
@@ -347,7 +347,7 @@ do_mbcs_sram_dmaread(struct mbcs_soft *soft, uint64_t
hostAddr,
{
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 *soft, uint64_t
hostAddr,
*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, const struct
cx_device_id *id)
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 --git a/drivers/char/mbcs.h b/drivers/char/mbcs.h
index b054351..ba67158 100644
--- a/drivers/char/mbcs.h
+++ b/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;
};
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
