From mboxrd@z Thu Jan 1 00:00:00 1970 From: akpm@linux-foundation.org Subject: + mbcs-convert-dmareadlock-to-mutex.patch added to -mm tree Date: Wed, 24 Oct 2007 21:12:01 -0700 Message-ID: <200710250412.l9P4C1IP031161@imap1.linux-foundation.org> Reply-To: linux-kernel@vger.kernel.org Return-path: Received: from smtp2.linux-foundation.org ([207.189.120.14]:49859 "EHLO smtp2.linux-foundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1761828AbXJYEME (ORCPT ); Thu, 25 Oct 2007 00:12:04 -0400 Sender: mm-commits-owner@vger.kernel.org List-Id: mm-commits@vger.kernel.org To: mm-commits@vger.kernel.org Cc: matthias.kaehlcke@gmail.com The patch titled MBCS: convert dmareadlock to mutex has been added to the -mm tree. Its filename is mbcs-convert-dmareadlock-to-mutex.patch *** Remember to use Documentation/SubmitChecklist when testing your code *** See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: MBCS: convert dmareadlock to mutex From: Matthias Kaehlcke MBCS: Convert the semaphore dmareadlock to the mutex API Signed-off-by: Matthias Kaehlcke Signed-off-by: Andrew Morton --- drivers/char/mbcs.c | 6 +++--- drivers/char/mbcs.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff -puN drivers/char/mbcs.c~mbcs-convert-dmareadlock-to-mutex drivers/char/mbcs.c --- a/drivers/char/mbcs.c~mbcs-convert-dmareadlock-to-mutex +++ a/drivers/char/mbcs.c @@ -347,7 +347,7 @@ do_mbcs_sram_dmaread(struct mbcs_soft *s { int rv = 0; - if (down_interruptible(&soft->dmareadlock)) + if (mutex_lock_interruptible(&soft->dmareadlock)) return -ERESTARTSYS; atomic_set(&soft->dmawrite_done, 0); @@ -372,7 +372,7 @@ do_mbcs_sram_dmaread(struct mbcs_soft *s *off += len; dmaread_exit: - up(&soft->dmareadlock); + mutex_unlock(&soft->dmareadlock); return rv; } @@ -764,7 +764,7 @@ static int mbcs_probe(struct cx_dev *dev 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); diff -puN drivers/char/mbcs.h~mbcs-convert-dmareadlock-to-mutex drivers/char/mbcs.h --- a/drivers/char/mbcs.h~mbcs-convert-dmareadlock-to-mutex +++ a/drivers/char/mbcs.h @@ -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; }; _ Patches currently in -mm which might be from matthias.kaehlcke@gmail.com are generic-ac97-mixer-modem-oss-use-list_for_each_entry.patch mbcs-convert-algolock-to-mutex.patch mbcs-convert-dmawritelock-to-mutex.patch mbcs-convert-dmareadlock-to-mutex.patch