mxc-nand duplicate case value in -next

mxc-nand duplicate case value in -next

[Sascha Hauer]

Hi,

Currently we have a duplicate case value in the mxc-nand driver in -next.
This is because of to different patches adding reset command support to
the driver, one from Eric (coming via the mtd master tree) and one from
Ivo (coming from the mxc master tree).
As I see it we should take Ivos patch as it adds i.MX21 support along
the way, so David, can you please drop Erics patch?

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: mxc-nand duplicate case value in -next

[Robert Schwebel]

Hi,

On Fri, Apr 23, 2010 at 09:36:25AM +0200, Sascha Hauer wrote:
> Currently we have a duplicate case value in the mxc-nand driver in
> -next. This is because of to different patches adding reset command
> support to the driver, one from Eric (coming via the mtd master tree)
> and one from Ivo (coming from the mxc master tree). As I see it we
> should take Ivos patch as it adds i.MX21 support along the way, so
> David, can you please drop Erics patch?

linux-next does still crash with

drivers/mtd/nand/mxc_nand.c: In function 'mxc_nand_command':
drivers/mtd/nand/mxc_nand.c:689: error: duplicate case value
drivers/mtd/nand/mxc_nand.c:606: error: previously used here
drivers/mtd/nand/mxc_nand.c: In function 'mxcnd_resume':
drivers/mtd/nand/mxc_nand.c:921: warning: unused variable 'host'
make[3]: *** [drivers/mtd/nand/mxc_nand.o] Error 1

David, would dropping Eric's patch (like suggested by Sascha) be an
acceptable solution?

Thanks,
rsc
-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: mxc-nand duplicate case value in -next

[Robert Schwebel]

David,

On Tue, Apr 27, 2010 at 09:53:10AM +0200, Robert Schwebel wrote:
> On Fri, Apr 23, 2010 at 09:36:25AM +0200, Sascha Hauer wrote:
> > Currently we have a duplicate case value in the mxc-nand driver in
> > -next. This is because of to different patches adding reset command
> > support to the driver, one from Eric (coming via the mtd master tree)
> > and one from Ivo (coming from the mxc master tree). As I see it we
> > should take Ivos patch as it adds i.MX21 support along the way, so
> > David, can you please drop Erics patch?
>
> linux-next does still crash with
>
> drivers/mtd/nand/mxc_nand.c: In function 'mxc_nand_command':
> drivers/mtd/nand/mxc_nand.c:689: error: duplicate case value
> drivers/mtd/nand/mxc_nand.c:606: error: previously used here
> drivers/mtd/nand/mxc_nand.c: In function 'mxcnd_resume':
> drivers/mtd/nand/mxc_nand.c:921: warning: unused variable 'host'
> make[3]: *** [drivers/mtd/nand/mxc_nand.o] Error 1
>
> David, would dropping Eric's patch (like suggested by Sascha) be an
> acceptable solution?

ping

rsc
-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

Re: mxc-nand duplicate case value in -next

[Robert Schwebel]

Hi,

On Thu, Apr 29, 2010 at 10:09:54AM +0200, Robert Schwebel wrote:
> On Tue, Apr 27, 2010 at 09:53:10AM +0200, Robert Schwebel wrote:
> > On Fri, Apr 23, 2010 at 09:36:25AM +0200, Sascha Hauer wrote:
> > > Currently we have a duplicate case value in the mxc-nand driver in
> > > -next. This is because of to different patches adding reset command
> > > support to the driver, one from Eric (coming via the mtd master tree)
> > > and one from Ivo (coming from the mxc master tree). As I see it we
> > > should take Ivos patch as it adds i.MX21 support along the way, so
> > > David, can you please drop Erics patch?
> >
> > linux-next does still crash with
> >
> > drivers/mtd/nand/mxc_nand.c: In function 'mxc_nand_command':
> > drivers/mtd/nand/mxc_nand.c:689: error: duplicate case value
> > drivers/mtd/nand/mxc_nand.c:606: error: previously used here
> > drivers/mtd/nand/mxc_nand.c: In function 'mxcnd_resume':
> > drivers/mtd/nand/mxc_nand.c:921: warning: unused variable 'host'
> > make[3]: *** [drivers/mtd/nand/mxc_nand.o] Error 1
> >
> > David, would dropping Eric's patch (like suggested by Sascha) be an
> > acceptable solution?
>
> ping

I just tested with next-20100517 and the duplicate case is still there.
David, can we do something to resolve this? Sascha has suggested a
solution above.

Thanks,
rsc
-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |