| Message ID | 49BE2453.9020801@nokia.com (mailing list archive) |
|---|---|
| State | Awaiting Upstream, archived |
| Headers | show |
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 <adrian.hunter@nokia.com> > Date: Tue, 10 Mar 2009 22:13:52 +0100 > Subject: [PATCH] ARM: OMAP3: mmc-twl4030 allow arbitrary slot names > > Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com> > --- > 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... -- 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/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); 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 36e95a6..aa2d99b 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 */ + const char *name; /* or NULL for default */ struct device *dev; /* returned: pointer to mmc adapter */ int ocr_mask; /* temporary HACK */ };