From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757383Ab0IGOiF (ORCPT ); Tue, 7 Sep 2010 10:38:05 -0400 Received: from www.tglx.de ([62.245.132.106]:43756 "EHLO www.tglx.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932113Ab0IGOdL (ORCPT ); Tue, 7 Sep 2010 10:33:11 -0400 Message-Id: <20100907125056.040881100@linutronix.de> User-Agent: quilt/0.47-1 Date: Tue, 07 Sep 2010 14:32:47 -0000 From: Thomas Gleixner To: LKML Cc: Andrew Morton , Ingo Molnar , Peter Zijlstra , Christoph Hellwig , James Bottomley , linux-scsi@vger.kernel.org Subject: [patch 14/30] scsi: aacraid semaphore cleanup References: <20100907124636.880953480@linutronix.de> Content-Disposition: inline; filename=drivers-scsi-sema.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Get rid of init_MUTEX[_LOCKED]() and use sema_init() instead. Signed-off-by: Thomas Gleixner Cc: James Bottomley Cc: linux-scsi@vger.kernel.org --- drivers/scsi/aacraid/commctrl.c | 2 +- drivers/scsi/aacraid/commsup.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: linux-2.6/drivers/scsi/aacraid/commctrl.c =================================================================== --- linux-2.6.orig/drivers/scsi/aacraid/commctrl.c +++ linux-2.6/drivers/scsi/aacraid/commctrl.c @@ -190,7 +190,7 @@ static int open_getadapter_fib(struct aa /* * Initialize the mutex used to wait for the next AIF. */ - init_MUTEX_LOCKED(&fibctx->wait_sem); + sema_init(&fibctx->wait_sem, 0); fibctx->wait = 0; /* * Initialize the fibs and set the count of fibs on Index: linux-2.6/drivers/scsi/aacraid/commsup.c =================================================================== --- linux-2.6.orig/drivers/scsi/aacraid/commsup.c +++ linux-2.6/drivers/scsi/aacraid/commsup.c @@ -124,7 +124,7 @@ int aac_fib_setup(struct aac_dev * dev) fibptr->hw_fib_va = hw_fib; fibptr->data = (void *) fibptr->hw_fib_va->data; fibptr->next = fibptr+1; /* Forward chain the fibs */ - init_MUTEX_LOCKED(&fibptr->event_wait); + sema_init(&fibptr->event_wait, 0); spin_lock_init(&fibptr->event_lock); hw_fib->header.XferState = cpu_to_le32(0xffffffff); hw_fib->header.SenderSize = cpu_to_le16(dev->max_fib_size);