From patchwork Mon Mar 23 17:47:39 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ladislav Michl X-Patchwork-Id: 13766 Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n2NHIiba020291 for ; Mon, 23 Mar 2009 17:18:44 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755050AbZCWRSl (ORCPT ); Mon, 23 Mar 2009 13:18:41 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754941AbZCWRSl (ORCPT ); Mon, 23 Mar 2009 13:18:41 -0400 Received: from virt.comanet.cz ([82.100.28.79]:50697 "EHLO virt.comanet.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750839AbZCWRSk (ORCPT ); Mon, 23 Mar 2009 13:18:40 -0400 X-Greylist: delayed 1848 seconds by postgrey-1.27 at vger.kernel.org; Mon, 23 Mar 2009 13:18:39 EDT Received: from debian ([192.168.81.53]) by virt.comanet.cz (8.13.1/8.13.1) with SMTP id n2NGlaWi026729; Mon, 23 Mar 2009 17:47:36 +0100 Received: by debian (sSMTP sendmail emulation); Mon, 23 Mar 2009 18:47:39 +0100 Date: Mon, 23 Mar 2009 18:47:39 +0100 From: Ladislav Michl To: Tony Lindgren Cc: linux-omap@vger.kernel.org Subject: Re: [PATCH 2/5] omap mmc: Add better MMC low-level init Message-ID: <20090323174739.GD20944@localhost.localdomain> References: <20081207213617.10456.43951.stgit@localhost> <20081207214747.10456.34844.stgit@localhost> <20090110224942.GA10556@michl.2n.cz> <20090110230059.GA10758@michl.2n.cz> <20090113134343.GK7344@atomide.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20090113134343.GK7344@atomide.com> User-Agent: Mutt/1.5.18 (2008-05-17) X-Virus-Scanned: ClamAV 0.94/9153/Mon Mar 23 16:37:27 2009 on ns.comanet.cz X-Virus-Status: Clean X-Spam-Status: No, score=-2.8 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_20 autolearn=ham version=3.2.4 X-Spam-Checker-Version: SpamAssassin 3.2.4 (2008-01-01) on ns.comanet.cz Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org On Tue, Jan 13, 2009 at 03:43:44PM +0200, Tony Lindgren wrote: > > diff --git a/arch/arm/plat-omap/include/mach/mmc.h b/arch/arm/plat-omap/include/mach/mmc.h > > index 031250f..1129e97 100644 > > --- a/arch/arm/plat-omap/include/mach/mmc.h > > +++ b/arch/arm/plat-omap/include/mach/mmc.h > > @@ -51,7 +51,6 @@ struct omap_mmc_platform_data { > > * not supported */ > > int (* init)(struct device *dev); > > void (* cleanup)(struct device *dev); > > - void (* shutdown)(struct device *dev); > > > > /* To handle board related suspend/resume functionality for MMC */ > > int (*suspend)(struct device *dev, int slot); > > @@ -77,10 +76,6 @@ struct omap_mmc_platform_data { > > > > /* use the internal clock */ > > unsigned internal_clock:1; > > - s16 power_pin; > > - > > - int switch_pin; /* gpio (card detect) */ > > - int gpio_wp; /* gpio (write protect) */ > > > > int (* set_bus_mode)(struct device *dev, int slot, int bus_mode); > > int (* set_power)(struct device *dev, int slot, int power_on, int vdd); > > Hmm, aren't switch_pin and gpio_wp used at least in the > mmc-twl4030.c? Yes, they are. I missed them completely. Sorry. > I guess they could be internal to mmc-twl4030.c if not used > in the drivers directly. They could, but that's a bit more complicated. Will look at it later. > > diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c > > index 67d7b7f..84de289 100644 > > --- a/drivers/mmc/host/omap.c > > +++ b/drivers/mmc/host/omap.c > > @@ -157,8 +157,6 @@ struct mmc_omap_host { > > struct timer_list dma_timer; > > unsigned dma_len; > > > > - short power_pin; > > - > > struct mmc_omap_slot *slots[OMAP_MMC_MAX_SLOTS]; > > struct mmc_omap_slot *current_slot; > > spinlock_t slot_lock; > > > > Looks like power_pin could go though. Updated patch follows Signed-off-by: Ladislav Michl --- To unsubscribe from this list: send the line "unsubscribe linux-omap" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm/plat-omap/include/mach/mmc.h b/arch/arm/plat-omap/include/mach/mmc.h index 4435bd4..81d5b36 100644 --- a/arch/arm/plat-omap/include/mach/mmc.h +++ b/arch/arm/plat-omap/include/mach/mmc.h @@ -79,7 +79,6 @@ struct omap_mmc_platform_data { /* use the internal clock */ unsigned internal_clock:1; - s16 power_pin; int switch_pin; /* gpio (card detect) */ int gpio_wp; /* gpio (write protect) */ diff --git a/drivers/mmc/host/omap.c b/drivers/mmc/host/omap.c index 67d7b7f..e8e0e09 100644 --- a/drivers/mmc/host/omap.c +++ b/drivers/mmc/host/omap.c @@ -157,8 +157,6 @@ struct mmc_omap_host { struct timer_list dma_timer; unsigned dma_len; - short power_pin; - struct mmc_omap_slot *slots[OMAP_MMC_MAX_SLOTS]; struct mmc_omap_slot *current_slot; spinlock_t slot_lock;