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

MBCS: convert algolock to mutex

Browse source 
MBCS: Convert the semaphore algolock 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:24 -08:00 • committed by Linus Torvalds
parent 92df5c3e38
commit a40ba84957
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
drivers/char/mbcs.c
View file

@ -23,6 +23,7 @@
#include <linux/device.h> #include <linux/device.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/uio.h> #include <linux/uio.h>
#include <linux/mutex.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/system.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; void *mmr_base = soft->mmr_base;
union cm_control cm_control; union cm_control cm_control;
if (down_interruptible(&soft->algolock)) if (mutex_lock_interruptible(&soft->algolock))
return -ERESTARTSYS; return -ERESTARTSYS;
atomic_set(&soft->algo_done, 0); 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; cm_control.alg_go = 1;
MBCS_MMR_SET(mmr_base, MBCS_CM_CONTROL, cm_control.cm_control_reg); MBCS_MMR_SET(mmr_base, MBCS_CM_CONTROL, cm_control.cm_control_reg);
up(&soft->algolock); mutex_unlock(&soft->algolock);
return 0; 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->dmawritelock);
init_MUTEX(&soft->dmareadlock); init_MUTEX(&soft->dmareadlock);
init_MUTEX(&soft->algolock); mutex_init(&soft->algolock);
mbcs_getdma_init(&soft->getdma); mbcs_getdma_init(&soft->getdma);
mbcs_putdma_init(&soft->putdma); mbcs_putdma_init(&soft->putdma);

2
drivers/char/mbcs.h
View file

@ -539,7 +539,7 @@ struct mbcs_soft {
atomic_t algo_done; atomic_t algo_done;
struct semaphore dmawritelock; struct semaphore dmawritelock;
struct semaphore dmareadlock; struct semaphore dmareadlock;
struct semaphore algolock; struct mutex algolock;
}; };
static int mbcs_open(struct inode *ip, struct file *fp); static int mbcs_open(struct inode *ip, struct file *fp);