aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/char/mbcs.c
diff options
context:
space:
mode:
authorMatthias Kaehlcke <matthias.kaehlcke@gmail.com>2008-02-07 03:15:24 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-07 11:42:25 -0500
commit46bca69682731104b42f99da763b9a08a0574291 (patch)
tree46871c6415ff483e23b5a497ec4761c70c3556af /drivers/char/mbcs.c
parenta40ba8495798fa7eae6fa12b16a0d06d906ba47f (diff)
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/char/mbcs.c')
-rw-r--r--drivers/char/mbcs.c6
1 files changed, 3 insertions, 3 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,
310{ 310{
311 int rv = 0; 311 int rv = 0;
312 312
313 if (down_interruptible(&soft->dmawritelock)) 313 if (mutex_lock_interruptible(&soft->dmawritelock))
314 return -ERESTARTSYS; 314 return -ERESTARTSYS;
315 315
316 atomic_set(&soft->dmawrite_done, 0); 316 atomic_set(&soft->dmawrite_done, 0);
@@ -336,7 +336,7 @@ do_mbcs_sram_dmawrite(struct mbcs_soft *soft, uint64_t hostAddr,
336 *off += len; 336 *off += len;
337 337
338dmawrite_exit: 338dmawrite_exit:
339 up(&soft->dmawritelock); 339 mutex_unlock(&soft->dmawritelock);
340 340
341 return rv; 341 return rv;
342} 342}
@@ -763,7 +763,7 @@ static int mbcs_probe(struct cx_dev *dev, const struct cx_device_id *id)
763 init_waitqueue_head(&soft->dmaread_queue); 763 init_waitqueue_head(&soft->dmaread_queue);
764 init_waitqueue_head(&soft->algo_queue); 764 init_waitqueue_head(&soft->algo_queue);
765 765
766 init_MUTEX(&soft->dmawritelock); 766 mutex_init(&soft->dmawritelock);
767 init_MUTEX(&soft->dmareadlock); 767 init_MUTEX(&soft->dmareadlock);
768 mutex_init(&soft->algolock); 768 mutex_init(&soft->algolock);
769 769