* Russell King - ARM Linux <[email protected]> [090316 03:17]: > On Mon, Mar 16, 2009 at 12:05:07PM +0200, Adrian Hunter wrote: > >> From 9b04f19a7e88f8877176c25845c38676ee3127c1 Mon Sep 17 00:00:00 2001 > > From: Adrian Hunter <[email protected]> > > Date: Tue, 10 Mar 2009 22:13:52 +0100 > > Subject: [PATCH] ARM: OMAP3: mmc-twl4030 allow arbitrary slot names > > > > Signed-off-by: Adrian Hunter <[email protected]> > > --- > > arch/arm/mach-omap2/mmc-twl4030.c | 6 +++++- > > arch/arm/mach-omap2/mmc-twl4030.h | 1 + > > 2 files changed, 6 insertions(+), 1 deletions(-) > > > > diff --git a/arch/arm/mach-omap2/mmc-twl4030.c > > b/arch/arm/mach-omap2/mmc-twl4030.c > > index a612a02..88b4bed 100644 > > --- a/arch/arm/mach-omap2/mmc-twl4030.c > > +++ b/arch/arm/mach-omap2/mmc-twl4030.c > > @@ -328,7 +328,11 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info > > *controllers) > > return; > > } > > > > - sprintf(twl->name, "mmc%islot%i", c->mmc, 1); > > + if (c->name) > > + strlcpy(twl->name, c->name, ARRAY_SIZE(twl->name)); > > + else > > + snprintf(twl->name, ARRAY_SIZE(twl->name), > > + "mmc%islot%i", c->mmc, 1); > > Good, except now we have a confusion over which patch does what...
Here's this one updated to apply with snprintf moved to the earlier patch in the series. Tony
>From 10e3a1012fce568e4be375102bf7af33543cb072 Mon Sep 17 00:00:00 2001 From: Adrian Hunter <[email protected]> Date: Mon, 16 Mar 2009 10:57:32 -0700 Subject: [PATCH] ARM: OMAP3: mmc-twl4030 allow arbitrary slot names, v3 Signed-off-by: Adrian Hunter <[email protected]> Acked-by: David Brownell <[email protected]> Signed-off-by: Tony Lindgren <[email protected]> diff --git a/arch/arm/mach-omap2/mmc-twl4030.c b/arch/arm/mach-omap2/mmc-twl4030.c index e2b2aeb..dc40b3e 100644 --- a/arch/arm/mach-omap2/mmc-twl4030.c +++ b/arch/arm/mach-omap2/mmc-twl4030.c @@ -402,8 +402,11 @@ void __init twl4030_mmc_init(struct twl4030_hsmmc_info *controllers) return; } - snprintf(twl->name, ARRAY_SIZE(twl->name), "mmc%islot%i", - c->mmc, 1); + if (c->name) + strncpy(twl->name, c->name, HSMMC_NAME_LEN); + else + snprintf(twl->name, ARRAY_SIZE(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 0aa1686..ea59e86 100644 --- a/arch/arm/mach-omap2/mmc-twl4030.h +++ b/arch/arm/mach-omap2/mmc-twl4030.h @@ -14,6 +14,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 */ };
