2010-08-31 02:13:59

by Mark F. Brown

Subject: [PATCH] ARM: pxa3xx: fix build error when CONFIG_MTD_PARTITIONS is not defined

If CONFIG_MTD_PARTITIONS is not defined for pxa3xx NAND driver it will display a build error:

drivers/built-in.o: In function `pxa3xx_nand_remove':
drivers/mtd/nand/pxa3xx_nand.c:1367: undefined reference to `del_mtd_partitions'
drivers/built-in.o: In function `pxa3xx_nand_probe':
drivers/mtd/nand/pxa3xx_nand.c:1334: undefined reference to `add_mtd_partitions'
make: *** [.tmp_vmlinux1] Error 1

Patched against Eric Miao's pxa tree

Mark F. Brown (1):
ARM: pxa3xx: fix build error when CONFIG_MTD_PARTITIONS is not
defined

drivers/mtd/nand/pxa3xx_nand.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)

2010-08-31 02:14:13

by Mark F. Brown

Subject: [PATCH] ARM: pxa3xx: fix build error when CONFIG_MTD_PARTITIONS is not defined

Signed-off-by: Mark F. Brown <[email protected]>
---
drivers/mtd/nand/pxa3xx_nand.c | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
index 4d89f37..4d01cda 100644
--- a/drivers/mtd/nand/pxa3xx_nand.c
+++ b/drivers/mtd/nand/pxa3xx_nand.c
@@ -1320,6 +1320,7 @@ static int pxa3xx_nand_probe(struct platform_device *pdev)
goto fail_free_irq;
}

+#ifdef CONFIG_MTD_PARTITIONS
if (mtd_has_cmdlinepart()) {
static const char *probes[] = { "cmdlinepart", NULL };
struct mtd_partition *parts;
@@ -1332,6 +1333,9 @@ static int pxa3xx_nand_probe(struct platform_device *pdev)
}

return add_mtd_partitions(mtd, pdata->parts, pdata->nr_parts);
+#else
+ return 0;
+#endif

fail_free_irq:
free_irq(irq, info);
@@ -1364,7 +1368,9 @@ static int pxa3xx_nand_remove(struct platform_device *pdev)
platform_set_drvdata(pdev, NULL);

del_mtd_device(mtd);
+#ifdef CONFIG_MTD_PARTITIONS
del_mtd_partitions(mtd);
+#endif
irq = platform_get_irq(pdev, 0);
if (irq >= 0)
free_irq(irq, info);
--
1.7.0.4

2010-08-31 05:51:09

by Haojian Zhuang

Subject: Re: [PATCH] ARM: pxa3xx: fix build error when CONFIG_MTD_PARTITIONS is not defined

On Thu, Aug 26, 2010 at 4:56 PM, Mark F. Brown <[email protected]> wrote:
> Signed-off-by: Mark F. Brown <[email protected]>
> ---
> ?drivers/mtd/nand/pxa3xx_nand.c | ? ?6 ++++++
> ?1 files changed, 6 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/mtd/nand/pxa3xx_nand.c b/drivers/mtd/nand/pxa3xx_nand.c
> index 4d89f37..4d01cda 100644
> --- a/drivers/mtd/nand/pxa3xx_nand.c
> +++ b/drivers/mtd/nand/pxa3xx_nand.c
> @@ -1320,6 +1320,7 @@ static int pxa3xx_nand_probe(struct platform_device *pdev)
> ? ? ? ? ? ? ? ?goto fail_free_irq;
> ? ? ? ?}
>
> +#ifdef CONFIG_MTD_PARTITIONS
> ? ? ? ?if (mtd_has_cmdlinepart()) {
> ? ? ? ? ? ? ? ?static const char *probes[] = { "cmdlinepart", NULL };
> ? ? ? ? ? ? ? ?struct mtd_partition *parts;
> @@ -1332,6 +1333,9 @@ static int pxa3xx_nand_probe(struct platform_device *pdev)
> ? ? ? ?}
>
> ? ? ? ?return add_mtd_partitions(mtd, pdata->parts, pdata->nr_parts);
> +#else
> + ? ? ? return 0;
> +#endif
>
> ?fail_free_irq:
> ? ? ? ?free_irq(irq, info);
> @@ -1364,7 +1368,9 @@ static int pxa3xx_nand_remove(struct platform_device *pdev)
> ? ? ? ?platform_set_drvdata(pdev, NULL);
>
> ? ? ? ?del_mtd_device(mtd);
> +#ifdef CONFIG_MTD_PARTITIONS
> ? ? ? ?del_mtd_partitions(mtd);
> +#endif
> ? ? ? ?irq = platform_get_irq(pdev, 0);
> ? ? ? ?if (irq >= 0)
> ? ? ? ? ? ? ? ?free_irq(irq, info);
> --
> 1.7.0.4
>
> --
> 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/
>

Hi Mark,

Don't forget to cc maintainer of mtd tree. I loop them now.

Thanks
Haojian

2010-08-31 23:31:37

by Artem Bityutskiy

Subject: Re: [PATCH] ARM: pxa3xx: fix build error when CONFIG_MTD_PARTITIONS is not defined

On Tue, 2010-08-31 at 13:51 +0800, Haojian Zhuang wrote:
> Hi Mark,
>
> Don't forget to cc maintainer of mtd tree. I loop them now.

FYI, the MTD maintainer id dwmw2, I'm just helping him sometimes.

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