NAND: fsl_upm: fix build problem with 2.6.28-rc2
Subsystems (2)
PATCH 1/1 NAND: fsl_upm: fix build problem with 2.6.28-rc2
From: Wolfgang Grandegger <[email protected]>
The patch fixes following build error:
CC drivers/mtd/nand/fsl_upm.odrivers/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.
--- drivers/mtd/nand/fsl_upm.c | 8 +++++--- 1 files changed, 5 insertions(+), 3 deletions(-)
drivers/mtd/nand/fsl_upm.c +5 -3
@@ -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);
Signature · 1 line
1.5.6.5
Quoted 42 lines · Anton Vorontsov
From: Wolfgang Grandegger <[email protected]>
The patch fixes following build error:
CC
drivers/mtd/nand/fsl_upm.odrivers/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 typedrivers/mtd/nand/fsl_upm.c:168: warning: passing argument 3 of 'of_mtd_parse_partitions' from incompatible pointer typedrivers/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 1The breakage was introduced in
69fd3a8d098faf41a04930afa83757c0555ee360("[MTD] remove unused mtd parameter inof_mtd_parse_partitions()").While at it, also add a check for the
of_mtd_parse_partitions()return value.Signed-off-by Wolfgang Grandegger <[email protected]>Signed-off-by Anton Vorontsov <[email protected]>---
drivers/mtd/nand/fsl_upm.c| 8 +++++---1 files changed, 5 insertions(+), 3 deletions(-)drivers/mtd/nand/fsl_upm.c +5
-3@@ -163,9 +163,11 @@ static int __devinit fun_chip_init(structfsl_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 )
Quoted 3 lines
ret = add_mtd_partitions(&fun->mtd, fun->parts, ret);Signature · 1 line
1.5.6.5
David,
what's going on with this patch?
- k
Quoted 6 lines
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected]
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:
[...]
Quoted 21 lines
Quoted 21 lines
The patch fixes following build error:
CC
drivers/mtd/nand/fsl_upm.odrivers/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 typedrivers/mtd/nand/fsl_upm.c:168: warning: passing argument 3 of 'of_mtd_parse_partitions' from incompatible pointer typedrivers/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 1The breakage was introduced in
69fd3a8d098faf41a04930afa83757c0555ee360
("[MTD] remove unused mtd parameter inof_mtd_parse_partitions()").While at it, also add a check for the
of_mtd_parse_partitions()return value.Signed-off-by Wolfgang Grandegger <[email protected]>Signed-off-by Anton Vorontsov <[email protected]>
[...]
Quoted 3 lines
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
Signature · 3 lines
Anton Vorontsov email: [email protected] irc://irc.freenode.net/bd2
Quoted 24 lines · Anton Vorontsov
On Wed, Dec 03, 2008 at 09:47:53AM -0600, Kumar Gala wrote:
[...]Quoted 21 lines
Quoted 21 lines
The patch fixes following build error:
CC
drivers/mtd/nand/fsl_upm.odrivers/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 typedrivers/mtd/nand/fsl_upm.c:168: warning: passing argument 3 of 'of_mtd_parse_partitions' from incompatible pointer typedrivers/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 1The breakage was introduced in
69fd3a8d098faf41a04930afa83757c0555ee360
("[MTD] remove unused mtd parameter inof_mtd_parse_partitions()").While at it, also add a check for the
of_mtd_parse_partitions()return value.Signed-off-by Wolfgang Grandegger <[email protected]>Signed-off-by Anton Vorontsov <[email protected]>[...]
Quoted 8 lines
Quoted 3 lines
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