diff options
| author | Matthias Kaehlcke <matthias.kaehlcke@gmail.com> | 2008-02-07 00:15:24 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-07 08:42:25 -0800 |
| commit | 46bca69682731104b42f99da763b9a08a0574291 (patch) | |
| tree | 46871c6415ff483e23b5a497ec4761c70c3556af /drivers | |
| parent | a40ba8495798fa7eae6fa12b16a0d06d906ba47f (diff) | |
| download | linux-stable-46bca69682731104b42f99da763b9a08a0574291.tar.gz linux-stable-46bca69682731104b42f99da763b9a08a0574291.tar.bz2 linux-stable-46bca69682731104b42f99da763b9a08a0574291.zip | |
MBCS: convert dmawritelock to mutex
MBCS: Convert the semaphore dmawritelock to the mutex API
Signed-off-by: Matthias Kaehlcke <matthias.kaehlcke@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/mbcs.c | 6 | ||||
| -rw-r--r-- | 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 035575c041cd..7321c14868af 100644 --- a/drivers/char/mbcs.c +++ b/drivers/char/mbcs.c @@ -310,7 +310,7 @@ do_mbcs_sram_dmawrite(struct mbcs_soft *soft, uint64_t hostAddr, { int rv = 0; - if (down_interruptible(&soft->dmawritelock)) + if (mutex_lock_interruptible(&soft->dmawritelock)) return -ERESTARTSYS; atomic_set(&soft->dmawrite_done, 0); @@ -336,7 +336,7 @@ do_mbcs_sram_dmawrite(struct mbcs_soft *soft, uint64_t hostAddr, *off += len; dmawrite_exit: - up(&soft->dmawritelock); + mutex_unlock(&soft->dmawritelock); return rv; } @@ -763,7 +763,7 @@ static int mbcs_probe(struct cx_dev *dev, const struct cx_device_id *id) init_waitqueue_head(&soft->dmaread_queue); init_waitqueue_head(&soft->algo_queue); - init_MUTEX(&soft->dmawritelock); + mutex_init(&soft->dmawritelock); init_MUTEX(&soft->dmareadlock); mutex_init(&soft->algolock); diff --git a/drivers/char/mbcs.h b/drivers/char/mbcs.h index d4d97abbce7f..b05435145d72 100644 --- a/drivers/char/mbcs.h +++ b/drivers/char/mbcs.h @@ -537,7 +537,7 @@ struct mbcs_soft { atomic_t dmawrite_done; atomic_t dmaread_done; atomic_t algo_done; - struct semaphore dmawritelock; + struct mutex dmawritelock; struct semaphore dmareadlock; struct mutex algolock; }; |