Skip to content

Commit

Permalink
MBCS: convert dmareadlock to mutex
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Matthias Kaehlcke authored and Linus Torvalds committed Feb 7, 2008
1 parent 46bca69 commit ae5e297
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 @@ -347,7 +347,7 @@ do_mbcs_sram_dmaread(struct mbcs_soft *soft, uint64_t hostAddr,
{
int rv = 0;

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

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

dmaread_exit:
up(&soft->dmareadlock);
mutex_unlock(&soft->dmareadlock);

return rv;
}
Expand Down Expand Up @@ -764,7 +764,7 @@ static int mbcs_probe(struct cx_dev *dev, const struct cx_device_id *id)
init_waitqueue_head(&soft->algo_queue);

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

mbcs_getdma_init(&soft->getdma);
Expand Down
2 changes: 1 addition & 1 deletion drivers/char/mbcs.h
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ struct mbcs_soft {
atomic_t dmaread_done;
atomic_t algo_done;
struct mutex dmawritelock;
struct semaphore dmareadlock;
struct mutex dmareadlock;
struct mutex algolock;
};

Expand Down

0 comments on commit ae5e297

Please sign in to comment.