From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Brownell Subject: Re: [PATCH 4/6] OMAP: mmc-twl4030 allow arbitrary slot names Date: Tue, 10 Mar 2009 09:56:43 -0800 Message-ID: <200903101056.44355.david-b@pacbell.net> References: <20090310093255.16889.30509.sendpatchset@ahunter-laptop> <20090310093322.16889.39355.sendpatchset@ahunter-laptop> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from n22.bullet.mail.mud.yahoo.com ([68.142.206.161]:20142 "HELO n22.bullet.mail.mud.yahoo.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with SMTP id S1755200AbZCJR4s (ORCPT ); Tue, 10 Mar 2009 13:56:48 -0400 In-Reply-To: <20090310093322.16889.39355.sendpatchset@ahunter-laptop> Content-Disposition: inline Sender: linux-omap-owner@vger.kernel.org List-Id: linux-omap@vger.kernel.org To: Adrian Hunter Cc: Tony Lindgren , Jarkko Lavinen , linux-omap Mailing List On Tuesday 10 March 2009, Adrian Hunter wrote: > >From 4c4a97595cab39443a85517c66bc26f5c2a9cae3 Mon Sep 17 00:00:00 2001 > From: Adrian Hunter > Date: Fri, 30 Jan 2009 11:10:19 +0200 > Subject: [PATCH] OMAP: mmc-twl4030 allow arbitrary slot names > > Signed-off-by: Adrian Hunter Acked-by: David Brownell Those current slot names are sort of useless, eh? Actually the MMC framework itself is no help here. If for example "mmcblk0" always came from host "mmc0" names would work a lot more smoothly. Instead, "mmcblk0" comes from the first card to be detected ... it might be from "mmc1" on one boot, "mmc0" on the next, "mmc2" on a third boot. > --- > arch/arm/mach-omap2/mmc-twl4030.c | 5 ++++- > arch/arm/mach-omap2/mmc-twl4030.h | 1 + > 2 files changed, 5 insertions(+), 1 deletions(-) > > diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c > index a58deba..8fc8e84 100644 > --- a/arch/arm/mach-omap2/mmc-twl4030.c > +++ b/arch/arm/mach-omap2/mmc-twl4030.c > @@ -419,7 +419,10 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers) > return; > } > > - sprintf(twl->name, "mmc%islot%i", c->mmc, 1); > + if (c->name) > + strncpy(twl->name, c->name, HSMMC_NAME_LEN); > + else > + sprintf(twl->name, "mmc%islot%i", c->mmc, 1); > mmc->slots[0].name = twl->name; > mmc->nr_slots = 1; > mmc->slots[0].wires = c->wires; > diff --git a/arch/arm/mach-omap2/mmc-twl4030.h b/arch/arm/mach-omap2/mmc-twl4030.h > index e87bc8d..69dbbc1 100644 > --- a/arch/arm/mach-omap2/mmc-twl4030.h > +++ b/arch/arm/mach-omap2/mmc-twl4030.h > @@ -15,6 +15,7 @@ struct twl4030_hsmmc_info { > bool cover_only; /* No card detect - just cover switch */ > int gpio_cd; /* or -EINVAL */ > int gpio_wp; /* or -EINVAL */ > + char *name; /* or NULL for default */ > struct device *dev; /* returned: pointer to mmc adapter */ > }; > > -- > 1.5.6.3 > >