Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761421AbYCGHOE (ORCPT ); Fri, 7 Mar 2008 02:14:04 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754824AbYCGHNx (ORCPT ); Fri, 7 Mar 2008 02:13:53 -0500 Received: from mx1.riseup.net ([204.13.164.18]:41831 "EHLO mx1.riseup.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752288AbYCGHNw (ORCPT ); Fri, 7 Mar 2008 02:13:52 -0500 Date: Fri, 7 Mar 2008 08:13:42 +0100 From: Matthias Kaehlcke To: Daniel Walker Cc: linux-pcmcia@lists.infradead.org, linux-kernel@vger.kernel.org, akpm@linux-foundation.org Subject: Re: [PATCH] Alchemy Semi Au1000 pcmcia driver: convert pcmcia_sockets_lock in a mutex Message-ID: <20080307071342.GE2783@traven> Mail-Followup-To: Matthias Kaehlcke , Daniel Walker , linux-pcmcia@lists.infradead.org, linux-kernel@vger.kernel.org, akpm@linux-foundation.org References: <20080306222246.GD2783@traven> <1204859149.3368.2.camel@localhost.localdomain> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1204859149.3368.2.camel@localhost.localdomain> User-Agent: Mutt/1.5.17 (2007-11-01) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2918 Lines: 95 El Thu, Mar 06, 2008 at 07:05:49PM -0800 Daniel Walker ha dit: > On Thu, 2008-03-06 at 23:22 +0100, Matthias Kaehlcke wrote: > > Alchemy Semi Au1000 pcmcia driver: The semaphore pcmcia_sockets_lock > > is used as a mutex, convert it to the mutex API > > > > Signed-off-by: Matthias Kaehlcke > > > > This doesn't appear to be in patch format .. There no filename at the > top.. somehow i messed it up when adding the patch to the mail. thanks for the pointer, here comes the good one -- Alchemy Semi Au1000 pcmcia driver: The semaphore pcmcia_sockets_lock is used as a mutex, convert it to the mutex API Signed-off-by: Matthias Kaehlcke -- diff --git a/drivers/pcmcia/au1000_generic.c b/drivers/pcmcia/au1000_generic.c index b693367..97e29c8 100644 --- a/drivers/pcmcia/au1000_generic.c +++ b/drivers/pcmcia/au1000_generic.c @@ -41,6 +41,7 @@ #include #include #include +#include #include #include @@ -71,7 +72,7 @@ extern struct au1000_pcmcia_socket au1000_pcmcia_socket[]; u32 *pcmcia_base_vaddrs[2]; extern const unsigned long mips_io_port_base; -DECLARE_MUTEX(pcmcia_sockets_lock); +DEFINE_MUTEX(pcmcia_sockets_lock); static int (*au1x00_pcmcia_hw_init[])(struct device *dev) = { au1x_board_init, @@ -472,7 +473,7 @@ int au1x00_drv_pcmcia_remove(struct device *dev) struct skt_dev_info *sinfo = dev_get_drvdata(dev); int i; - down(&pcmcia_sockets_lock); + mutex_lock(&pcmcia_sockets_lock); dev_set_drvdata(dev, NULL); for (i = 0; i < sinfo->nskt; i++) { @@ -488,7 +489,7 @@ int au1x00_drv_pcmcia_remove(struct device *dev) } kfree(sinfo); - up(&pcmcia_sockets_lock); + mutex_unlock(&pcmcia_sockets_lock); return 0; } @@ -501,13 +502,13 @@ static int au1x00_drv_pcmcia_probe(struct device *dev) { int i, ret = -ENODEV; - down(&pcmcia_sockets_lock); + mutex_lock(&pcmcia_sockets_lock); for (i=0; i < ARRAY_SIZE(au1x00_pcmcia_hw_init); i++) { ret = au1x00_pcmcia_hw_init[i](dev); if (ret == 0) break; } - up(&pcmcia_sockets_lock); + mutex_unlock(&pcmcia_sockets_lock); return ret; } -- Matthias Kaehlcke Linux System Developer Barcelona Anyone who has never made a mistake has never tried anything new (Albert Einstein) .''`. using free software / Debian GNU/Linux | http://debian.org : :' : `. `'` gpg --keyserver pgp.mit.edu --recv-keys 47D8E5D4 `- -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/