| Message ID | 1294745619-7142-4-git-send-email-dbaryshkov@gmail.com |
|---|---|
| State | New, archived |
| Headers | show |
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
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> >
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.
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
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);
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(-)