mtd: remove driver-core BUS_ID_SIZE
David Woodhouse
dwmw2 at infradead.org
Fri May 29 09:21:48 EDT 2009
On Fri, 2009-05-29 at 14:11 +0100, David Woodhouse wrote:
> On Thu, 2009-04-16 at 18:26 +0200, Kay Sievers wrote:
> > From: Kay Sievers <kay.sievers at vrfy.org>
> > Subject: mtd: remove driver-core BUS_ID_SIZE
> >
> > The name size limit is gone from the driver-core, the BUS_ID_SIZE
> > value will be removed.
> >
> > Cc: dwmw2 at infradead.org
> > Cc: linux-mtd at lists.infradead.org
> > Acked-by: Greg Kroah-Hartman <gregkh at suse.de>
> > Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
> > ---
> > drivers/mtd/nand/txx9ndfmc.c | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > --- a/drivers/mtd/nand/txx9ndfmc.c
> > +++ b/drivers/mtd/nand/txx9ndfmc.c
> > @@ -64,7 +64,7 @@ struct txx9ndfmc_priv {
> > struct nand_chip chip;
> > struct mtd_info mtd;
> > int cs;
> > - char mtdname[BUS_ID_SIZE + 2];
> > + char mtdname[20 + 2];
> > };
> >
> > #define MAX_TXX9NDFMC_DEV 4
>
> Not so cunning. You're explicitly noting that the limit on the input
> string size is gone, and yet you do nothing about the code which uses
> it...
>
> if (plat->ch_mask != 1) {
> txx9_priv->cs = i;
> sprintf(txx9_priv->mtdname, "%s.%u",
> dev_name(&dev->dev), i);
> } else {
> txx9_priv->cs = -1;
> strcpy(txx9_priv->mtdname, dev_name(&dev->dev));
> }
This might work better. Nemoto-san, can you test and confirm?
diff --git a/drivers/mtd/nand/txx9ndfmc.c b/drivers/mtd/nand/txx9ndfmc.c
index 8124792..6329382 100644
--- a/drivers/mtd/nand/txx9ndfmc.c
+++ b/drivers/mtd/nand/txx9ndfmc.c
@@ -64,7 +64,7 @@ struct txx9ndfmc_priv {
struct nand_chip chip;
struct mtd_info mtd;
int cs;
- char mtdname[BUS_ID_SIZE + 2];
+ char *mtdname;
};
#define MAX_TXX9NDFMC_DEV 4
@@ -333,12 +333,21 @@ static int __init txx9ndfmc_probe(struct platform_device *dev)
txx9_priv->dev = dev;
if (plat->ch_mask != 1) {
+ char *devname = dev_name(&dev->dev);
txx9_priv->cs = i;
+ txx9_priv->mtdname = kmalloc(strlen(devname) + 3,
+ GFP_KERNEL);
+ if (!txx9_mtdname) {
+ kfree(txx9_priv);
+ dev_err(&dev->dev,
+ "Unable to allocate TXx9 NDFMC MTD device name.\n");
+ continue;
+ }
sprintf(txx9_priv->mtdname, "%s.%u",
- dev_name(&dev->dev), i);
+ devname, i);
} else {
txx9_priv->cs = -1;
- strcpy(txx9_priv->mtdname, dev_name(&dev->dev));
+ txx9_priv->mtdname = dev_name(&dev->dev);
}
if (plat->wide_mask & (1 << i))
chip->options |= NAND_BUSWIDTH_16;
@@ -385,6 +394,8 @@ static int __exit txx9ndfmc_remove(struct platform_device *dev)
kfree(drvdata->parts[i]);
#endif
del_mtd_device(mtd);
+ if (txx9_priv->mtdname != dev_name(&dev->dev))
+ kfree(txx9_priv->mtdname);
kfree(txx9_priv);
}
return 0;
--
dwmw2
More information about the linux-mtd
mailing list