evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MBCS: convert dmareadlock to mutex

Browse source 
MBCS: Convert the semaphore dmareadlock 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>
This commit is contained in:
Matthias Kaehlcke 2008-02-07 00:15:25 -08:00 • committed by Linus Torvalds
parent 46bca69682
commit ae5e29798a
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/char/mbcs.c
View file

@ -347,7 +347,7 @@ do_mbcs_sram_dmaread(struct mbcs_soft *soft, uint64_t hostAddr,
{ {
int rv = 0; int rv = 0;
if (down_interruptible(&soft->dmareadlock)) if (mutex_lock_interruptible(&soft->dmareadlock))
return -ERESTARTSYS; return -ERESTARTSYS;
atomic_set(&soft->dmawrite_done, 0); atomic_set(&soft->dmawrite_done, 0);
@ -372,7 +372,7 @@ do_mbcs_sram_dmaread(struct mbcs_soft *soft, uint64_t hostAddr,
*off += len; *off += len;
dmaread_exit: dmaread_exit:
up(&soft->dmareadlock); mutex_unlock(&soft->dmareadlock);
return rv; 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); init_waitqueue_head(&soft->algo_queue);
mutex_init(&soft->dmawritelock); mutex_init(&soft->dmawritelock);
init_MUTEX(&soft->dmareadlock); mutex_init(&soft->dmareadlock);
mutex_init(&soft->algolock); mutex_init(&soft->algolock);
mbcs_getdma_init(&soft->getdma); mbcs_getdma_init(&soft->getdma);

2
drivers/char/mbcs.h
View file

@ -538,7 +538,7 @@ struct mbcs_soft {
atomic_t dmaread_done; atomic_t dmaread_done;
atomic_t algo_done; atomic_t algo_done;
struct mutex dmawritelock; struct mutex dmawritelock;
struct semaphore dmareadlock; struct mutex dmareadlock;
struct mutex algolock; struct mutex algolock;
}; };