Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=a40ba8495798fa7eae6fa12b16a0d06d906ba47f
Commit: a40ba8495798fa7eae6fa12b16a0d06d906ba47f
Parent: 92df5c3e38c0a0a66a456926039548275dfb3328
Author: Matthias Kaehlcke <[EMAIL PROTECTED]>
AuthorDate: Thu Feb 7 00:15:24 2008 -0800
Committer: Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Thu Feb 7 08:42:25 2008 -0800
MBCS: convert algolock to mutex
MBCS: Convert the semaphore algolock 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 | 7 ++++---
drivers/char/mbcs.h | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/drivers/char/mbcs.c b/drivers/char/mbcs.c
index 3c5802a..035575c 100644
--- a/drivers/char/mbcs.c
+++ b/drivers/char/mbcs.c
@@ -23,6 +23,7 @@
#include <linux/device.h>
#include <linux/mm.h>
#include <linux/uio.h>
+#include <linux/mutex.h>
#include <asm/io.h>
#include <asm/uaccess.h>
#include <asm/system.h>
@@ -281,7 +282,7 @@ static inline int mbcs_algo_start(struct mbcs_soft *soft)
void *mmr_base = soft->mmr_base;
union cm_control cm_control;
- if (down_interruptible(&soft->algolock))
+ if (mutex_lock_interruptible(&soft->algolock))
return -ERESTARTSYS;
atomic_set(&soft->algo_done, 0);
@@ -298,7 +299,7 @@ static inline int mbcs_algo_start(struct mbcs_soft *soft)
cm_control.alg_go = 1;
MBCS_MMR_SET(mmr_base, MBCS_CM_CONTROL, cm_control.cm_control_reg);
- up(&soft->algolock);
+ mutex_unlock(&soft->algolock);
return 0;
}
@@ -764,7 +765,7 @@ static int mbcs_probe(struct cx_dev *dev, const struct
cx_device_id *id)
init_MUTEX(&soft->dmawritelock);
init_MUTEX(&soft->dmareadlock);
- init_MUTEX(&soft->algolock);
+ mutex_init(&soft->algolock);
mbcs_getdma_init(&soft->getdma);
mbcs_putdma_init(&soft->putdma);
diff --git a/drivers/char/mbcs.h b/drivers/char/mbcs.h
index c9905a3..d4d97ab 100644
--- a/drivers/char/mbcs.h
+++ b/drivers/char/mbcs.h
@@ -539,7 +539,7 @@ struct mbcs_soft {
atomic_t algo_done;
struct semaphore dmawritelock;
struct semaphore dmareadlock;
- struct semaphore algolock;
+ struct mutex algolock;
};
static int mbcs_open(struct inode *ip, struct file *fp);
-
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
