| Message ID | 20081126163840.GA21669@oksana.dev.rtsoft.ru |
|---|---|
| State | New, archived |
| Headers | show |
On Nov 26, 2008, at 10:38 AM, Anton Vorontsov wrote: > From: Wolfgang Grandegger <wg@grandegger.com> > > The patch fixes following build error: > > CC drivers/mtd/nand/fsl_upm.o > drivers/mtd/nand/fsl_upm.c: In function 'fun_chip_init': > drivers/mtd/nand/fsl_upm.c:168: warning: passing argument 2 of > 'of_mtd_parse_partitions' from incompatible pointer type > drivers/mtd/nand/fsl_upm.c:168: warning: passing argument 3 of > 'of_mtd_parse_partitions' from incompatible pointer type > drivers/mtd/nand/fsl_upm.c:168: error: too many arguments to > function 'of_mtd_parse_partitions' > make[1]: *** [drivers/mtd/nand/fsl_upm.o] Error 1 > > The breakage was introduced in > 69fd3a8d098faf41a04930afa83757c0555ee360 > ("[MTD] remove unused mtd parameter in of_mtd_parse_partitions()"). > > While at it, also add a check for the of_mtd_parse_partitions() return > value. > > Signed-off-by: Wolfgang Grandegger <wg@grandegger.com> > Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> > --- > drivers/mtd/nand/fsl_upm.c | 8 +++++--- > 1 files changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c > index 024e3ff..a83192f 100644 > --- a/drivers/mtd/nand/fsl_upm.c > +++ b/drivers/mtd/nand/fsl_upm.c > @@ -163,9 +163,11 @@ static int __devinit fun_chip_init(struct > fsl_upm_nand *fun, > ret = parse_mtd_partitions(&fun->mtd, part_types, &fun->parts, 0); > > #ifdef CONFIG_MTD_OF_PARTS > - if (ret == 0) > - ret = of_mtd_parse_partitions(fun->dev, &fun->mtd, > - flash_np, &fun->parts); > + if (ret == 0) { > + ret = of_mtd_parse_partitions(fun->dev, flash_np, &fun->parts); > + if (ret < 0) > + goto err; > + } > #endif > if (ret > 0) > ret = add_mtd_partitions(&fun->mtd, fun->parts, ret); > -- > 1.5.6.5 David, what's going on with this patch? - k > > -- > To unsubscribe from this list: send the line "unsubscribe linux- > kernel" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > Please read the FAQ at http://www.tux.org/lkml/
On Wed, Dec 03, 2008 at 09:47:53AM -0600, Kumar Gala wrote: [...] >> The patch fixes following build error: >> >> CC drivers/mtd/nand/fsl_upm.o >> drivers/mtd/nand/fsl_upm.c: In function 'fun_chip_init': >> drivers/mtd/nand/fsl_upm.c:168: warning: passing argument 2 of >> 'of_mtd_parse_partitions' from incompatible pointer type >> drivers/mtd/nand/fsl_upm.c:168: warning: passing argument 3 of >> 'of_mtd_parse_partitions' from incompatible pointer type >> drivers/mtd/nand/fsl_upm.c:168: error: too many arguments to function >> 'of_mtd_parse_partitions' >> make[1]: *** [drivers/mtd/nand/fsl_upm.o] Error 1 >> >> The breakage was introduced in >> 69fd3a8d098faf41a04930afa83757c0555ee360 >> ("[MTD] remove unused mtd parameter in of_mtd_parse_partitions()"). >> >> While at it, also add a check for the of_mtd_parse_partitions() return >> value. >> >> Signed-off-by: Wolfgang Grandegger <wg@grandegger.com> >> Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> [...] > David, > > what's going on with this patch? Recently I got email from Andrew's patch tracking system that the patch was merged into subsystem tree. Here it is: http://git.infradead.org/mtd-2.6.git?a=commitdiff;h=29b65861fbece04cfdf3fee352d5247369131850
On Dec 3, 2008, at 10:27 AM, Anton Vorontsov wrote: > On Wed, Dec 03, 2008 at 09:47:53AM -0600, Kumar Gala wrote: > [...] >>> The patch fixes following build error: >>> >>> CC drivers/mtd/nand/fsl_upm.o >>> drivers/mtd/nand/fsl_upm.c: In function 'fun_chip_init': >>> drivers/mtd/nand/fsl_upm.c:168: warning: passing argument 2 of >>> 'of_mtd_parse_partitions' from incompatible pointer type >>> drivers/mtd/nand/fsl_upm.c:168: warning: passing argument 3 of >>> 'of_mtd_parse_partitions' from incompatible pointer type >>> drivers/mtd/nand/fsl_upm.c:168: error: too many arguments to >>> function >>> 'of_mtd_parse_partitions' >>> make[1]: *** [drivers/mtd/nand/fsl_upm.o] Error 1 >>> >>> The breakage was introduced in >>> 69fd3a8d098faf41a04930afa83757c0555ee360 >>> ("[MTD] remove unused mtd parameter in of_mtd_parse_partitions()"). >>> >>> While at it, also add a check for the of_mtd_parse_partitions() >>> return >>> value. >>> >>> Signed-off-by: Wolfgang Grandegger <wg@grandegger.com> >>> Signed-off-by: Anton Vorontsov <avorontsov@ru.mvista.com> > [...] >> David, >> >> what's going on with this patch? > > Recently I got email from Andrew's patch tracking system that > the patch was merged into subsystem tree. Here it is: > > http://git.infradead.org/mtd-2.6.git?a=commitdiff;h=29b65861fbece04cfdf3fee352d5247369131850 is it going into 2.6.28 or waiting for .29? - k
diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c index 024e3ff..a83192f 100644 --- a/drivers/mtd/nand/fsl_upm.c +++ b/drivers/mtd/nand/fsl_upm.c @@ -163,9 +163,11 @@ static int __devinit fun_chip_init(struct fsl_upm_nand *fun, ret = parse_mtd_partitions(&fun->mtd, part_types, &fun->parts, 0); #ifdef CONFIG_MTD_OF_PARTS - if (ret == 0) - ret = of_mtd_parse_partitions(fun->dev, &fun->mtd, - flash_np, &fun->parts); + if (ret == 0) { + ret = of_mtd_parse_partitions(fun->dev, flash_np, &fun->parts); + if (ret < 0) + goto err; + } #endif if (ret > 0) ret = add_mtd_partitions(&fun->mtd, fun->parts, ret);