Patchwork mtd: remove driver-core BUS_ID_SIZE

login
register
mail settings
Submitter Kay Sievers
Date April 16, 2009, 4:26 p.m.
Message ID <1239899196.17211.11.camel@poy>
Download mbox | patch
Permalink /patch/26075/
State New
Headers show

Comments

Kay Sievers - April 16, 2009, 4:26 p.m.
From: Kay Sievers <kay.sievers@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@infradead.org
Cc: linux-mtd@lists.infradead.org
Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Kay Sievers <kay.sievers@vrfy.org>
---
 drivers/mtd/nand/txx9ndfmc.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Artem Bityutskiy - April 17, 2009, 7:25 a.m.
On Thu, 2009-04-16 at 18:26 +0200, Kay Sievers wrote:
> From: Kay Sievers <kay.sievers@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@infradead.org
> Cc: linux-mtd@lists.infradead.org
> Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
> Signed-off-by: Kay Sievers <kay.sievers@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

Pushed, to l2-mtd-2.6.git. This does not guarantee anything,
it just mean I'll ping dwmw2 to pull from that tree.
David Woodhouse - May 29, 2009, 1:11 p.m.
On Thu, 2009-04-16 at 18:26 +0200, Kay Sievers wrote:
> From: Kay Sievers <kay.sievers@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@infradead.org
> Cc: linux-mtd@lists.infradead.org
> Acked-by: Greg Kroah-Hartman <gregkh@suse.de>
> Signed-off-by: Kay Sievers <kay.sievers@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));
		}

Patch

--- 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