[PATCH 1/5] MTD: make MTD_CONCAT support mandatory

[PATCH 1/5] MTD: make MTD_CONCAT support mandatory

[Dmitry Eremin-Solenikov]

Move mtdconcat to be an integral part of the mtd core. It's a tiny bit
of code, which bears 'say Y if you don't know what to do' note in the
Kconfig. OTOH there are several ugly ifdefs depending on the MTD_CONCAT.
So, making MTD_CONCAT support mandatory will allow us to clean up code a
lot.

Kconfig entry is changed to be a bool defaulting to Y, so all code
pieces depending on it, will have MTD_CONCAT Kconfig symbol and
CONFIG_MTD_CONCAT define. This will be removed in one of next patches.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: Artem Bityutskiy <dedekind1@gmail.com>
Cc: Stefan Roese <sr@denx.de>
---
 drivers/mtd/Kconfig  |    3 ++-
 drivers/mtd/Makefile |    3 +--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 1e2cbf5..38ca5f2 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -34,7 +34,8 @@ config MTD_TESTS
 	  various checks and verifications when loaded.
 
 config MTD_CONCAT
-	tristate "MTD concatenating support"
+	bool
+	default y
 	help
 	  Support for concatenating several MTD devices into a single
 	  (virtual) one. This allows you to have -for example- a JFFS(2)
diff --git a/drivers/mtd/Makefile b/drivers/mtd/Makefile
index 760abc5..a166b71 100644
--- a/drivers/mtd/Makefile
+++ b/drivers/mtd/Makefile
@@ -4,10 +4,9 @@
 
 # Core functionality.
 obj-$(CONFIG_MTD)		+= mtd.o
-mtd-y				:= mtdcore.o mtdsuper.o
+mtd-y				:= mtdcore.o mtdsuper.o mtdconcat.o
 mtd-$(CONFIG_MTD_PARTITIONS)	+= mtdpart.o
 
-obj-$(CONFIG_MTD_CONCAT)	+= mtdconcat.o
 obj-$(CONFIG_MTD_REDBOOT_PARTS) += redboot.o
 obj-$(CONFIG_MTD_CMDLINE_PARTS) += cmdlinepart.o
 obj-$(CONFIG_MTD_AFS_PARTS)	+= afs.o
-- 
1.7.2.3

[PATCH 2/5] MTD: drop MTD_CONCAT dependencies from Kconfig

[Dmitry Eremin-Solenikov]

As MTD_CONCAT is becoming a part of mtd core, it's no longer necessary
to depend on it in Kconfig scripts. Drop such references.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: Artem Bityutskiy <dedekind1@gmail.com>
Cc: Stefan Roese <sr@denx.de>
---
 drivers/mtd/maps/Kconfig |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/mtd/maps/Kconfig b/drivers/mtd/maps/Kconfig
index a0dd7bb..a34e969 100644
--- a/drivers/mtd/maps/Kconfig
+++ b/drivers/mtd/maps/Kconfig
@@ -114,7 +114,7 @@ config MTD_SUN_UFLASH
 
 config MTD_SC520CDP
 	tristate "CFI Flash device mapped on AMD SC520 CDP"
-	depends on X86 && MTD_CFI && MTD_CONCAT
+	depends on X86 && MTD_CFI
 	help
 	  The SC520 CDP board has two banks of CFI-compliant chips and one
 	  Dual-in-line JEDEC chip. This 'mapping' driver supports that
@@ -262,7 +262,7 @@ config MTD_BCM963XX
 
 config MTD_DILNETPC
 	tristate "CFI Flash device mapped on DIL/Net PC"
-	depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT && BROKEN
+	depends on X86 && MTD_PARTITIONS && MTD_CFI_INTELEXT && BROKEN
 	help
 	  MTD map driver for SSV DIL/Net PC Boards "DNP" and "ADNP".
 	  For details, see <http://www.ssv-embedded.de/ssv/pc104/p169.htm>
-- 
1.7.2.3

[PATCH 3/5] MTD: drop CONFIG_MTD_CONCAT ifdefs

[Dmitry Eremin-Solenikov]

As MTD_CONCAT is becoming a part of mtd core, it's now meaningless
to to check for it in ifdefs. Drop such references from MTD code.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: Artem Bityutskiy <dedekind1@gmail.com>
Cc: Stefan Roese <sr@denx.de>
---
 drivers/mtd/maps/ceiva.c            |    6 ------
 drivers/mtd/maps/integrator-flash.c |   10 ----------
 drivers/mtd/maps/physmap.c          |    8 --------
 drivers/mtd/maps/physmap_of.c       |    8 --------
 drivers/mtd/maps/sa1100-flash.c     |    8 --------
 5 files changed, 0 insertions(+), 40 deletions(-)

diff --git a/drivers/mtd/maps/ceiva.c b/drivers/mtd/maps/ceiva.c
index c09f4f5..e5f645b 100644
--- a/drivers/mtd/maps/ceiva.c
+++ b/drivers/mtd/maps/ceiva.c
@@ -194,16 +194,10 @@ static int __init clps_setup_mtd(struct clps_info *clps, int nr, struct mtd_info
 			 * We detected multiple devices.  Concatenate
 			 * them together.
 			 */
-#ifdef CONFIG_MTD_CONCAT
 			*rmtd = mtd_concat_create(subdev, found,
 						  "clps flash");
 			if (*rmtd == NULL)
 				ret = -ENXIO;
-#else
-			printk(KERN_ERR "clps flash: multiple devices "
-			       "found but MTD concat support disabled.\n");
-			ret = -ENXIO;
-#endif
 		}
 	}
 
diff --git a/drivers/mtd/maps/integrator-flash.c b/drivers/mtd/maps/integrator-flash.c
index 2aac41b..e22ff5a 100644
--- a/drivers/mtd/maps/integrator-flash.c
+++ b/drivers/mtd/maps/integrator-flash.c
@@ -202,7 +202,6 @@ static int armflash_probe(struct platform_device *dev)
 	if (info->nr_subdev == 1)
 		info->mtd = info->subdev[0].mtd;
 	else if (info->nr_subdev > 1) {
-#ifdef CONFIG_MTD_CONCAT
 		struct mtd_info *cdev[info->nr_subdev];
 
 		/*
@@ -215,11 +214,6 @@ static int armflash_probe(struct platform_device *dev)
 					      dev_name(&dev->dev));
 		if (info->mtd == NULL)
 			err = -ENXIO;
-#else
-		printk(KERN_ERR "armflash: multiple devices found but "
-		       "MTD concat support disabled.\n");
-		err = -ENXIO;
-#endif
 	}
 
 	if (err < 0)
@@ -244,10 +238,8 @@ static int armflash_probe(struct platform_device *dev)
  cleanup:
 	if (info->mtd) {
 		del_mtd_partitions(info->mtd);
-#ifdef CONFIG_MTD_CONCAT
 		if (info->mtd != info->subdev[0].mtd)
 			mtd_concat_destroy(info->mtd);
-#endif
 	}
 	kfree(info->parts);
  subdev_err:
@@ -272,10 +264,8 @@ static int armflash_remove(struct platform_device *dev)
 	if (info) {
 		if (info->mtd) {
 			del_mtd_partitions(info->mtd);
-#ifdef CONFIG_MTD_CONCAT
 			if (info->mtd != info->subdev[0].mtd)
 				mtd_concat_destroy(info->mtd);
-#endif
 		}
 		kfree(info->parts);
 
diff --git a/drivers/mtd/maps/physmap.c b/drivers/mtd/maps/physmap.c
index 4c18b98..7522df4 100644
--- a/drivers/mtd/maps/physmap.c
+++ b/drivers/mtd/maps/physmap.c
@@ -59,10 +59,8 @@ static int physmap_flash_remove(struct platform_device *dev)
 #else
 		del_mtd_device(info->cmtd);
 #endif
-#ifdef CONFIG_MTD_CONCAT
 		if (info->cmtd != info->mtd[0])
 			mtd_concat_destroy(info->cmtd);
-#endif
 	}
 
 	for (i = 0; i < MAX_RESOURCES; i++) {
@@ -159,15 +157,9 @@ static int physmap_flash_probe(struct platform_device *dev)
 		/*
 		 * We detected multiple devices. Concatenate them together.
 		 */
-#ifdef CONFIG_MTD_CONCAT
 		info->cmtd = mtd_concat_create(info->mtd, devices_found, dev_name(&dev->dev));
 		if (info->cmtd == NULL)
 			err = -ENXIO;
-#else
-		printk(KERN_ERR "physmap-flash: multiple devices "
-		       "found but MTD concat support disabled.\n");
-		err = -ENXIO;
-#endif
 	}
 	if (err)
 		goto err_out;
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index 9861814..8bc574b 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -104,12 +104,10 @@ static int of_flash_remove(struct platform_device *dev)
 		return 0;
 	dev_set_drvdata(&dev->dev, NULL);
 
-#ifdef CONFIG_MTD_CONCAT
 	if (info->cmtd != info->list[0].mtd) {
 		del_mtd_device(info->cmtd);
 		mtd_concat_destroy(info->cmtd);
 	}
-#endif
 
 	if (info->cmtd) {
 		if (OF_FLASH_PARTS(info)) {
@@ -336,16 +334,10 @@ static int __devinit of_flash_probe(struct platform_device *dev,
 		/*
 		 * We detected multiple devices. Concatenate them together.
 		 */
-#ifdef CONFIG_MTD_CONCAT
 		info->cmtd = mtd_concat_create(mtd_list, info->list_size,
 					       dev_name(&dev->dev));
 		if (info->cmtd == NULL)
 			err = -ENXIO;
-#else
-		printk(KERN_ERR "physmap_of: multiple devices "
-		       "found but MTD concat support disabled.\n");
-		err = -ENXIO;
-#endif
 	}
 	if (err)
 		goto err_out;
diff --git a/drivers/mtd/maps/sa1100-flash.c b/drivers/mtd/maps/sa1100-flash.c
index f3af87e..da875908 100644
--- a/drivers/mtd/maps/sa1100-flash.c
+++ b/drivers/mtd/maps/sa1100-flash.c
@@ -232,10 +232,8 @@ static void sa1100_destroy(struct sa_info *info, struct flash_platform_data *pla
 		else
 			del_mtd_partitions(info->mtd);
 #endif
-#ifdef CONFIG_MTD_CONCAT
 		if (info->mtd != info->subdev[0].mtd)
 			mtd_concat_destroy(info->mtd);
-#endif
 	}
 
 	kfree(info->parts);
@@ -321,7 +319,6 @@ sa1100_setup_mtd(struct platform_device *pdev, struct flash_platform_data *plat)
 		info->mtd = info->subdev[0].mtd;
 		ret = 0;
 	} else if (info->num_subdev > 1) {
-#ifdef CONFIG_MTD_CONCAT
 		struct mtd_info *cdev[nr];
 		/*
 		 * We detected multiple devices.  Concatenate them together.
@@ -333,11 +330,6 @@ sa1100_setup_mtd(struct platform_device *pdev, struct flash_platform_data *plat)
 					      plat->name);
 		if (info->mtd == NULL)
 			ret = -ENXIO;
-#else
-		printk(KERN_ERR "SA1100 flash: multiple devices "
-		       "found but MTD concat support disabled.\n");
-		ret = -ENXIO;
-#endif
 	}
 
 	if (ret == 0)
-- 
1.7.2.3

[PATCH 4/5] CRIS: stop checking for MTD_CONCAT

[Dmitry Eremin-Solenikov]

As MTD_CONCAT support is becoming an integral part of MTD core,
there is no need for it's special treatment. So stop checking for
MTD_CONCAT availability.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: Artem Bityutskiy <dedekind1@gmail.com>
Cc: Stefan Roese <sr@denx.de>
Cc: linux-cris-kernel@axis.com
---
 arch/cris/Kconfig                         |    1 -
 arch/cris/arch-v10/drivers/axisflashmap.c |    6 ------
 arch/cris/arch-v32/drivers/Kconfig        |    1 -
 arch/cris/arch-v32/drivers/axisflashmap.c |    6 ------
 4 files changed, 0 insertions(+), 14 deletions(-)

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 613e628..e05bd2f 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -277,7 +277,6 @@ config ETRAX_AXISFLASHMAP
 	select MTD_CHAR
 	select MTD_BLOCK
 	select MTD_PARTITIONS
-	select MTD_CONCAT
 	select MTD_COMPLEX_MAPPINGS
 	help
 	  This option enables MTD mapping of flash devices.  Needed to use
diff --git a/arch/cris/arch-v10/drivers/axisflashmap.c b/arch/cris/arch-v10/drivers/axisflashmap.c
index b207970..ed708e1 100644
--- a/arch/cris/arch-v10/drivers/axisflashmap.c
+++ b/arch/cris/arch-v10/drivers/axisflashmap.c
@@ -234,7 +234,6 @@ static struct mtd_info *flash_probe(void)
 	}
 
 	if (mtd_cse0 && mtd_cse1) {
-#ifdef CONFIG_MTD_CONCAT
 		struct mtd_info *mtds[] = { mtd_cse0, mtd_cse1 };
 
 		/* Since the concatenation layer adds a small overhead we
@@ -246,11 +245,6 @@ static struct mtd_info *flash_probe(void)
 		 */
 		mtd_cse = mtd_concat_create(mtds, ARRAY_SIZE(mtds),
 					    "cse0+cse1");
-#else
-		printk(KERN_ERR "%s and %s: Cannot concatenate due to kernel "
-		       "(mis)configuration!\n", map_cse0.name, map_cse1.name);
-		mtd_cse = NULL;
-#endif
 		if (!mtd_cse) {
 			printk(KERN_ERR "%s and %s: Concatenation failed!\n",
 			       map_cse0.name, map_cse1.name);
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig
index a2dd740..1633b12 100644
--- a/arch/cris/arch-v32/drivers/Kconfig
+++ b/arch/cris/arch-v32/drivers/Kconfig
@@ -406,7 +406,6 @@ config ETRAX_AXISFLASHMAP
 	select MTD_CHAR
 	select MTD_BLOCK
 	select MTD_PARTITIONS
-	select MTD_CONCAT
 	select MTD_COMPLEX_MAPPINGS
 	help
 	  This option enables MTD mapping of flash devices.  Needed to use
diff --git a/arch/cris/arch-v32/drivers/axisflashmap.c b/arch/cris/arch-v32/drivers/axisflashmap.c
index 51e1e85..3d75125 100644
--- a/arch/cris/arch-v32/drivers/axisflashmap.c
+++ b/arch/cris/arch-v32/drivers/axisflashmap.c
@@ -275,7 +275,6 @@ static struct mtd_info *flash_probe(void)
 	}
 
 	if (count > 1) {
-#ifdef CONFIG_MTD_CONCAT
 		/* Since the concatenation layer adds a small overhead we
 		 * could try to figure out if the chips in cse0 and cse1 are
 		 * identical and reprobe the whole cse0+cse1 window. But since
@@ -284,11 +283,6 @@ static struct mtd_info *flash_probe(void)
 		 * complicating the probing procedure.
 		 */
 		mtd_total = mtd_concat_create(mtds, count, "cse0+cse1");
-#else
-		printk(KERN_ERR "%s and %s: Cannot concatenate due to kernel "
-		       "(mis)configuration!\n", map_cse0.name, map_cse1.name);
-		mtd_toal = NULL;
-#endif
 		if (!mtd_total) {
 			printk(KERN_ERR "%s and %s: Concatenation failed!\n",
 				map_cse0.name, map_cse1.name);
-- 
1.7.2.3

Re: [PATCH 4/5] CRIS: stop checking for MTD_CONCAT

[Jesper Nilsson]

On Tue, Jan 11, 2011 at 12:33:38PM +0100, Dmitry Eremin-Solenikov wrote:
> As MTD_CONCAT support is becoming an integral part of MTD core,
> there is no need for it's special treatment. So stop checking for
> MTD_CONCAT availability.
> 
> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>

Looks good, I'll pull this patch into the cris-tree.

Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>

Thanks!

/^JN - Jesper Nilsson
-- 
               Jesper Nilsson -- jesper.nilsson@axis.com

Re: [PATCH 4/5] CRIS: stop checking for MTD_CONCAT

[Dmitry Eremin-Solenikov]

On Wed, Jan 12, 2011 at 3:40 PM, Jesper Nilsson <jesper.nilsson@axis.com> wrote:
> On Tue, Jan 11, 2011 at 12:33:38PM +0100, Dmitry Eremin-Solenikov wrote:
>> As MTD_CONCAT support is becoming an integral part of MTD core,
>> there is no need for it's special treatment. So stop checking for
>> MTD_CONCAT availability.
>>
>> Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
>
> Looks good, I'll pull this patch into the cris-tree.

Thanks! Please note that it depends however on other MTD patches from
this serie.

>
> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
>


-- 
With best wishes
Dmitry

Re: [PATCH 4/5] CRIS: stop checking for MTD_CONCAT

[Artem Bityutskiy]

On Wed, 2011-01-12 at 13:40 +0100, Jesper Nilsson wrote:
> On Tue, Jan 11, 2011 at 12:33:38PM +0100, Dmitry Eremin-Solenikov wrote:
> > As MTD_CONCAT support is becoming an integral part of MTD core,
> > there is no need for it's special treatment. So stop checking for
> > MTD_CONCAT availability.
> > 
> > Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> 
> Looks good, I'll pull this patch into the cris-tree.
> 
> Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>

I've put whole patch series to my l2-mtd-2.6 tree, I think it is better
to keep the CRIS patch there as well. Please, give your ack to merge the
CRIS patch via the MTD tree.

-- 
Best Regards,
Artem Bityutskiy (Битюцкий Артём)

Re: [PATCH 4/5] CRIS: stop checking for MTD_CONCAT

[Jesper Nilsson]

On Tue, Jan 18, 2011 at 12:05:19PM +0100, Artem Bityutskiy wrote:
> On Wed, 2011-01-12 at 13:40 +0100, Jesper Nilsson wrote:
> > On Tue, Jan 11, 2011 at 12:33:38PM +0100, Dmitry Eremin-Solenikov wrote:
> > > As MTD_CONCAT support is becoming an integral part of MTD core,
> > > there is no need for it's special treatment. So stop checking for
> > > MTD_CONCAT availability.
> > > 
> > > Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
> > 
> > Looks good, I'll pull this patch into the cris-tree.
> > 
> > Signed-off-by: Jesper Nilsson <jesper.nilsson@axis.com>
> 
> I've put whole patch series to my l2-mtd-2.6 tree, I think it is better
> to keep the CRIS patch there as well. Please, give your ack to merge the
> CRIS patch via the MTD tree.

No problem, and thanks again.

Acked-by: Jesper Nilsson <jesper.nilsson@axis.com>

/^JN - Jesper Nilsson
-- 
               Jesper Nilsson -- jesper.nilsson@axis.com

SV: [PATCH 4/5] CRIS: stop checking for MTD_CONCAT

[Mikael Starvik]

Agreed.

Signed-off-by: Mikael Starvik starvik@axis.com

________________________________________
Från: Dmitry Eremin-Solenikov [dbaryshkov@gmail.com]
Skickat: den 11 januari 2011 12:33
Till: David Woodhouse
Kopia: Stefan Roese; linux-mtd@lists.infradead.org; linux-cris-kernel; Artem Bityutskiy
Ämne: [PATCH 4/5] CRIS: stop checking for MTD_CONCAT

As MTD_CONCAT support is becoming an integral part of MTD core,
there is no need for it's special treatment. So stop checking for
MTD_CONCAT availability.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: Artem Bityutskiy <dedekind1@gmail.com>
Cc: Stefan Roese <sr@denx.de>
Cc: linux-cris-kernel@axis.com
---
 arch/cris/Kconfig                         |    1 -
 arch/cris/arch-v10/drivers/axisflashmap.c |    6 ------
 arch/cris/arch-v32/drivers/Kconfig        |    1 -
 arch/cris/arch-v32/drivers/axisflashmap.c |    6 ------
 4 files changed, 0 insertions(+), 14 deletions(-)

diff --git a/arch/cris/Kconfig b/arch/cris/Kconfig
index 613e628..e05bd2f 100644
--- a/arch/cris/Kconfig
+++ b/arch/cris/Kconfig
@@ -277,7 +277,6 @@ config ETRAX_AXISFLASHMAP
        select MTD_CHAR
        select MTD_BLOCK
        select MTD_PARTITIONS
-       select MTD_CONCAT
        select MTD_COMPLEX_MAPPINGS
        help
          This option enables MTD mapping of flash devices.  Needed to use
diff --git a/arch/cris/arch-v10/drivers/axisflashmap.c b/arch/cris/arch-v10/drivers/axisflashmap.c
index b207970..ed708e1 100644
--- a/arch/cris/arch-v10/drivers/axisflashmap.c
+++ b/arch/cris/arch-v10/drivers/axisflashmap.c
@@ -234,7 +234,6 @@ static struct mtd_info *flash_probe(void)
        }

        if (mtd_cse0 && mtd_cse1) {
-#ifdef CONFIG_MTD_CONCAT
                struct mtd_info *mtds[] = { mtd_cse0, mtd_cse1 };

                /* Since the concatenation layer adds a small overhead we
@@ -246,11 +245,6 @@ static struct mtd_info *flash_probe(void)
                 */
                mtd_cse = mtd_concat_create(mtds, ARRAY_SIZE(mtds),
                                            "cse0+cse1");
-#else
-               printk(KERN_ERR "%s and %s: Cannot concatenate due to kernel "
-                      "(mis)configuration!\n", map_cse0.name, map_cse1.name);
-               mtd_cse = NULL;
-#endif
                if (!mtd_cse) {
                        printk(KERN_ERR "%s and %s: Concatenation failed!\n",
                               map_cse0.name, map_cse1.name);
diff --git a/arch/cris/arch-v32/drivers/Kconfig b/arch/cris/arch-v32/drivers/Kconfig
index a2dd740..1633b12 100644
--- a/arch/cris/arch-v32/drivers/Kconfig
+++ b/arch/cris/arch-v32/drivers/Kconfig
@@ -406,7 +406,6 @@ config ETRAX_AXISFLASHMAP
        select MTD_CHAR
        select MTD_BLOCK
        select MTD_PARTITIONS
-       select MTD_CONCAT
        select MTD_COMPLEX_MAPPINGS
        help
          This option enables MTD mapping of flash devices.  Needed to use
diff --git a/arch/cris/arch-v32/drivers/axisflashmap.c b/arch/cris/arch-v32/drivers/axisflashmap.c
index 51e1e85..3d75125 100644
--- a/arch/cris/arch-v32/drivers/axisflashmap.c
+++ b/arch/cris/arch-v32/drivers/axisflashmap.c
@@ -275,7 +275,6 @@ static struct mtd_info *flash_probe(void)
        }

        if (count > 1) {
-#ifdef CONFIG_MTD_CONCAT
                /* Since the concatenation layer adds a small overhead we
                 * could try to figure out if the chips in cse0 and cse1 are
                 * identical and reprobe the whole cse0+cse1 window. But since
@@ -284,11 +283,6 @@ static struct mtd_info *flash_probe(void)
                 * complicating the probing procedure.
                 */
                mtd_total = mtd_concat_create(mtds, count, "cse0+cse1");
-#else
-               printk(KERN_ERR "%s and %s: Cannot concatenate due to kernel "
-                      "(mis)configuration!\n", map_cse0.name, map_cse1.name);
-               mtd_toal = NULL;
-#endif
                if (!mtd_total) {
                        printk(KERN_ERR "%s and %s: Concatenation failed!\n",
                                map_cse0.name, map_cse1.name);
--
1.7.2.3


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

[PATCH 5/5] MTD: drop MTD_CONCAT from Kconfig entirely

[Dmitry Eremin-Solenikov]

As there are no more dependencies on MTD_CONCAT or CONFIG_MTD_CONCAT,
drop this entry from Kconfig entirely.

Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
---
 drivers/mtd/Kconfig |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)

diff --git a/drivers/mtd/Kconfig b/drivers/mtd/Kconfig
index 38ca5f2..90f5cf7 100644
--- a/drivers/mtd/Kconfig
+++ b/drivers/mtd/Kconfig
@@ -33,15 +33,6 @@ config MTD_TESTS
 	  should normally be compiled as kernel modules. The modules perform
 	  various checks and verifications when loaded.
 
-config MTD_CONCAT
-	bool
-	default y
-	help
-	  Support for concatenating several MTD devices into a single
-	  (virtual) one. This allows you to have -for example- a JFFS(2)
-	  file system spanning multiple physical flash chips. If unsure,
-	  say 'Y'.
-
 config MTD_PARTITIONS
 	bool "MTD partitioning support"
 	help
-- 
1.7.2.3

Re: [PATCH 1/5] MTD: make MTD_CONCAT support mandatory

[Stefan Roese]

On Tuesday 11 January 2011 12:33:35 Dmitry Eremin-Solenikov wrote:
> Move mtdconcat to be an integral part of the mtd core. It's a tiny bit
> of code, which bears 'say Y if you don't know what to do' note in the
> Kconfig. OTOH there are several ugly ifdefs depending on the MTD_CONCAT.
> So, making MTD_CONCAT support mandatory will allow us to clean up code a
> lot.
> 
> Kconfig entry is changed to be a bool defaulting to Y, so all code
> pieces depending on it, will have MTD_CONCAT Kconfig symbol and
> CONFIG_MTD_CONCAT define. This will be removed in one of next patches.

Whole patch series looks good. Thanks. I'm not sure if it makes more sense to 
squash the MTD patches into one patch. Either way I'm fine with it, so:

Acked-by: Stefan Roese <sr@denx.de>

for the whole patch series.
 
Cheers,
Stefan

Re: [PATCH 1/5] MTD: make MTD_CONCAT support mandatory

[Dmitry Eremin-Solenikov]

Hello,

On Wed, Jan 12, 2011 at 4:25 PM, Stefan Roese <sr@denx.de> wrote:
> On Tuesday 11 January 2011 12:33:35 Dmitry Eremin-Solenikov wrote:
>> Move mtdconcat to be an integral part of the mtd core. It's a tiny bit
>> of code, which bears 'say Y if you don't know what to do' note in the
>> Kconfig. OTOH there are several ugly ifdefs depending on the MTD_CONCAT.
>> So, making MTD_CONCAT support mandatory will allow us to clean up code a
>> lot.
>>
>> Kconfig entry is changed to be a bool defaulting to Y, so all code
>> pieces depending on it, will have MTD_CONCAT Kconfig symbol and
>> CONFIG_MTD_CONCAT define. This will be removed in one of next patches.
>
> Whole patch series looks good. Thanks. I'm not sure if it makes more sense to
> squash the MTD patches into one patch. Either way I'm fine with it, so:
>
> Acked-by: Stefan Roese <sr@denx.de>
>
> for the whole patch series.

What about this series? Will it find it's way to kernel or should I do
some more steps?

-- 
With best wishes
Dmitry

Re: [PATCH 1/5] MTD: make MTD_CONCAT support mandatory

[Artem Bityutskiy]

On Tue, 2011-02-15 at 17:07 +0300, Dmitry Eremin-Solenikov wrote:
> Hello,
> 
> On Wed, Jan 12, 2011 at 4:25 PM, Stefan Roese <sr@denx.de> wrote:
> > On Tuesday 11 January 2011 12:33:35 Dmitry Eremin-Solenikov wrote:
> >> Move mtdconcat to be an integral part of the mtd core. It's a tiny bit
> >> of code, which bears 'say Y if you don't know what to do' note in the
> >> Kconfig. OTOH there are several ugly ifdefs depending on the MTD_CONCAT.
> >> So, making MTD_CONCAT support mandatory will allow us to clean up code a
> >> lot.
> >>
> >> Kconfig entry is changed to be a bool defaulting to Y, so all code
> >> pieces depending on it, will have MTD_CONCAT Kconfig symbol and
> >> CONFIG_MTD_CONCAT define. This will be removed in one of next patches.
> >
> > Whole patch series looks good. Thanks. I'm not sure if it makes more sense to
> > squash the MTD patches into one patch. Either way I'm fine with it, so:
> >
> > Acked-by: Stefan Roese <sr@denx.de>
> >
> > for the whole patch series.
> 
> What about this series? Will it find it's way to kernel or should I do
> some more steps?

They still sit in my l2-mtd-2.6.git tree. You are not expected to do
anything, David should look at them an pick them (or reject with an
e-mail explaining the reasons) later. Usually he does this closer to the
merge window.

-- 
Best Regards,
Artem Bityutskiy (Артём Битюцкий)

Re: [PATCH 1/5] MTD: make MTD_CONCAT support mandatory

[Dmitry Eremin-Solenikov]

On 2/25/11, Artem Bityutskiy <dedekind1@gmail.com> wrote:
> On Tue, 2011-02-15 at 17:07 +0300, Dmitry Eremin-Solenikov wrote:
>> What about this series? Will it find it's way to kernel or should I do
>> some more steps?
>
> They still sit in my l2-mtd-2.6.git tree. You are not expected to do
> anything, David should look at them an pick them (or reject with an
> e-mail explaining the reasons) later. Usually he does this closer to the
> merge window.

Fine, thank you for the explanation. I was just asking because I did not
know the process behind MTD subsystem.

BTW: I've heard the idea about making MTD partitions also a mandatory
functionality of MTD subsystem. If I make such patches, will stand a chance
to be accepted, or it's still better to keep MTD parts an option?

-- 
With best wishes
Dmitry

Re: [PATCH 1/5] MTD: make MTD_CONCAT support mandatory

[Artem Bityutskiy]

On Fri, 2011-02-25 at 13:05 +0300, Dmitry Eremin-Solenikov wrote:
> On 2/25/11, Artem Bityutskiy <dedekind1@gmail.com> wrote:
> > On Tue, 2011-02-15 at 17:07 +0300, Dmitry Eremin-Solenikov wrote:
> >> What about this series? Will it find it's way to kernel or should I do
> >> some more steps?
> >
> > They still sit in my l2-mtd-2.6.git tree. You are not expected to do
> > anything, David should look at them an pick them (or reject with an
> > e-mail explaining the reasons) later. Usually he does this closer to the
> > merge window.
> 
> Fine, thank you for the explanation. I was just asking because I did not
> know the process behind MTD subsystem.

It should probably be documented. But how it works is that there is
David who is the maintainer. But he is very busy. And there is me who
helps him. I collect patches in my l2 tree. I review those I can and put
my signed-off-by or some other tag. I do not review all patches, and
those I did not review do not have my signed-off-by.

Then at some point David takes a look at my tree and takes patches from
there. If there are patches he dislikes, he usually replies with a
comment and does not take the patch.

So, in your case, the patches are still waiting for his attention. In
the worst case, he picks patches from my tree when the merge window
opens.

> BTW: I've heard the idea about making MTD partitions also a mandatory
> functionality of MTD subsystem. If I make such patches, will stand a chance
> to be accepted, or it's still better to keep MTD parts an option?

In my humble opinion which I think was supported by other people - yes,
the config option is useless and only contributes to mess. I personally
believe we need to kill this.

And I just asked David, he does not mind.

-- 
Best Regards,
Artem Bityutskiy (Артём Битюцкий)

Re: [PATCH 1/5] MTD: make MTD_CONCAT support mandatory

[Artem Bityutskiy]

On Fri, 2011-02-25 at 13:05 +0300, Dmitry Eremin-Solenikov wrote:
> On 2/25/11, Artem Bityutskiy <dedekind1@gmail.com> wrote:
> > On Tue, 2011-02-15 at 17:07 +0300, Dmitry Eremin-Solenikov wrote:
> >> What about this series? Will it find it's way to kernel or should I do
> >> some more steps?
> >
> > They still sit in my l2-mtd-2.6.git tree. You are not expected to do
> > anything, David should look at them an pick them (or reject with an
> > e-mail explaining the reasons) later. Usually he does this closer to the
> > merge window.
> 
> Fine, thank you for the explanation. I was just asking because I did not
> know the process behind MTD subsystem.
> 
> BTW: I've heard the idea about making MTD partitions also a mandatory
> functionality of MTD subsystem. If I make such patches, will stand a chance
> to be accepted, or it's still better to keep MTD parts an option?

Yeah, it is obvious that CONFIG_MTD_PARTITIONS is a problem:

[dedekind@eru linux-2.6 (master)]$ grep -r CONFIG_MTD_PARTITIONS drivers/mtd/* | wc -l
128

If you could clean this up, that would be great!

-- 
Best Regards,
Artem Bityutskiy (Артём Битюцкий)