Skip to content

Commit

Permalink
MBCS: convert dmawritelock to mutex
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Matthias Kaehlcke authored and Linus Torvalds committed Feb 7, 2008
1 parent a40ba84 commit 46bca69
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions drivers/char/mbcs.c
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ do_mbcs_sram_dmawrite(struct mbcs_soft *soft, uint64_t hostAddr,
{
int rv = 0;

if (down_interruptible(&soft->dmawritelock))
if (mutex_lock_interruptible(&soft->dmawritelock))
return -ERESTARTSYS;

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

dmawrite_exit:
up(&soft->dmawritelock);
mutex_unlock(&soft->dmawritelock);

return rv;
}
Expand Down Expand Up @@ -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->algo_queue);

init_MUTEX(&soft->dmawritelock);
mutex_init(&soft->dmawritelock);
init_MUTEX(&soft->dmareadlock);
mutex_init(&soft->algolock);

Expand Down
2 changes: 1 addition & 1 deletion drivers/char/mbcs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down

0 comments on commit 46bca69

Please sign in to comment.