Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 46bca696 authored by Matthias Kaehlcke's avatar Matthias Kaehlcke Committed by Linus Torvalds
Browse files

MBCS: convert dmawritelock to mutex 



MBCS: Convert the semaphore dmawritelock to the mutex API

Signed-off-by: default avatarMatthias Kaehlcke <matthias.kaehlcke@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent a40ba849

drivers/char/mbcs.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -310,7 +310,7 @@ do_mbcs_sram_dmawrite(struct mbcs_soft *soft, uint64_t hostAddr, 
{

{

	int rv = 0;

	int rv = 0;





	if (down_interruptible(&soft->dmawritelock))

	if (mutex_lock_interruptible(&soft->dmawritelock))

		return -ERESTARTSYS;

		return -ERESTARTSYS;





	atomic_set(&soft->dmawrite_done, 0);

	atomic_set(&soft->dmawrite_done, 0);
@@ -336,7 +336,7 @@ do_mbcs_sram_dmawrite(struct mbcs_soft *soft, uint64_t hostAddr, 
	*off += len;

	*off += len;





dmawrite_exit:

dmawrite_exit:

	up(&soft->dmawritelock);

	mutex_unlock(&soft->dmawritelock);





	return rv;

	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->dmaread_queue);

	init_waitqueue_head(&soft->algo_queue);

	init_waitqueue_head(&soft->algo_queue);





	init_MUTEX(&soft->dmawritelock);

	mutex_init(&soft->dmawritelock);

	init_MUTEX(&soft->dmareadlock);

	init_MUTEX(&soft->dmareadlock);

	mutex_init(&soft->algolock);

	mutex_init(&soft->algolock);

drivers/char/mbcs.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -537,7 +537,7 @@ struct mbcs_soft { 
	atomic_t dmawrite_done;

	atomic_t dmawrite_done;

	atomic_t dmaread_done;

	atomic_t dmaread_done;

	atomic_t algo_done;

	atomic_t algo_done;

	struct semaphore dmawritelock;

	struct mutex dmawritelock;

	struct semaphore dmareadlock;

	struct semaphore dmareadlock;

	struct mutex algolock;

	struct mutex algolock;

};

};