From: Matthias Kaehlcke MBCS: Convert the semaphore dmawritelock to the mutex API Signed-off-by: Matthias Kaehlcke Signed-off-by: Andrew Morton --- 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-dmawritelock-to-mutex drivers/char/mbcs.c --- a/drivers/char/mbcs.c~mbcs-convert-dmawritelock-to-mutex +++ a/drivers/char/mbcs.c @@ -310,7 +310,7 @@ do_mbcs_sram_dmawrite(struct mbcs_soft * { 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 * *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 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 -puN drivers/char/mbcs.h~mbcs-convert-dmawritelock-to-mutex drivers/char/mbcs.h --- a/drivers/char/mbcs.h~mbcs-convert-dmawritelock-to-mutex +++ a/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; }; _