linux-next: build failure after merge of the nand tree

linux-next: build failure after merge of the nand tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 547 bytes --]

Hi all,

After merging the nand tree, today's linux-next build (x86_64
allmodconfig) failed like this:

FATAL: modpost: drivers/mtd/nand/raw/ams-delta: sizeof(struct of_device_id)=200 is not a modulo of the size of section __mod_of__<identifier>_device_table=64.
Fix definition of struct of_device_id in mod_devicetable.h

Maybe caused by commit

  966d708517e3 ("mtd: rawnand: ams-delta: Add module device tables")

But I have no idea why.

I have used the nand tree from next-20200310 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the nand tree

[Miquel Raynal]

Hi Stephen,

+ Janusz, ams-delta patch author

Stephen Rothwell <sfr@canb.auug.org.au> wrote on Wed, 11 Mar 2020
13:16:16 +1100:

> Hi all,
> 
> After merging the nand tree, today's linux-next build (x86_64
> allmodconfig) failed like this:

Thanks for the report.

> 
> FATAL: modpost: drivers/mtd/nand/raw/ams-delta: sizeof(struct of_device_id)=200 is not a modulo of the size of section __mod_of__<identifier>_device_table=64.
> Fix definition of struct of_device_id in mod_devicetable.h
> 
> Maybe caused by commit
> 
>   966d708517e3 ("mtd: rawnand: ams-delta: Add module device tables")
> 
> But I have no idea why.
> 

This is strange. I think this is caused because of the addition of a
second device table with the same "of" scope. Changing one of them to
"platform" (the legacy one) seems to fix the problem.

Janusz, Is the following change okay for you? I would like to apply it
today so that linux-next get's updated with the 50+ stack of new
patches by tomorrow.

	--- a/drivers/mtd/nand/raw/ams-delta.c
	+++ b/drivers/mtd/nand/raw/ams-delta.c
	@@ -411,7 +411,7 @@ static const struct platform_device_id gpio_nand_plat_id_table[] = {
	                /* sentinel */
	        },
	 };
	-MODULE_DEVICE_TABLE(of, gpio_nand_plat_id_table);
	+MODULE_DEVICE_TABLE(platform, gpio_nand_plat_id_table);
 
	 static struct platform_driver gpio_nand_driver = {
	        .probe          = gpio_nand_probe,


Thanks,
Miquèl

Re: linux-next: build failure after merge of the nand tree

[Boris Brezillon]

On Wed, 11 Mar 2020 11:10:41 +0100
Miquel Raynal <miquel.raynal@bootlin.com> wrote:

> Hi Stephen,
> 
> + Janusz, ams-delta patch author
> 
> Stephen Rothwell <sfr@canb.auug.org.au> wrote on Wed, 11 Mar 2020
> 13:16:16 +1100:
> 
> > Hi all,
> > 
> > After merging the nand tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:  
> 
> Thanks for the report.
> 
> > 
> > FATAL: modpost: drivers/mtd/nand/raw/ams-delta: sizeof(struct of_device_id)=200 is not a modulo of the size of section __mod_of__<identifier>_device_table=64.
> > Fix definition of struct of_device_id in mod_devicetable.h
> > 
> > Maybe caused by commit
> > 
> >   966d708517e3 ("mtd: rawnand: ams-delta: Add module device tables")
> > 
> > But I have no idea why.
> >   
> 
> This is strange. I think this is caused because of the addition of a
> second device table with the same "of" scope. Changing one of them to
> "platform" (the legacy one) seems to fix the problem.
> 
> Janusz, Is the following change okay for you? I would like to apply it
> today so that linux-next get's updated with the 50+ stack of new
> patches by tomorrow.

Yep, this change looks good to me, I don't think you need to wait for
Janusz' ack to merge it.

Regards,

Boris

Re: linux-next: build failure after merge of the nand tree

[Janusz Krzysztofik]

Hi Miquel,

On Wednesday, March 11, 2020 11:10:41 A.M. CET Miquel Raynal wrote:
> Hi Stephen,
> 
> + Janusz, ams-delta patch author
> 
> Stephen Rothwell <sfr@canb.auug.org.au> wrote on Wed, 11 Mar 2020
> 13:16:16 +1100:
> 
> > Hi all,
> > 
> > After merging the nand tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> 
> Thanks for the report.
> 
> > 
> > FATAL: modpost: drivers/mtd/nand/raw/ams-delta: sizeof(struct of_device_id)=200 is not a modulo of the size of section __mod_of__<identifier>_device_table=64.
> > Fix definition of struct of_device_id in mod_devicetable.h
> > 
> > Maybe caused by commit
> > 
> >   966d708517e3 ("mtd: rawnand: ams-delta: Add module device tables")
> > 
> > But I have no idea why.
> > 
> 
> This is strange. I think this is caused because of the addition of a
> second device table with the same "of" scope. Changing one of them to
> "platform" (the legacy one) seems to fix the problem.
> 
> Janusz, Is the following change okay for you? I would like to apply it
> today so that linux-next get's updated with the 50+ stack of new
> patches by tomorrow.
> 
> 	--- a/drivers/mtd/nand/raw/ams-delta.c
> 	+++ b/drivers/mtd/nand/raw/ams-delta.c
> 	@@ -411,7 +411,7 @@ static const struct platform_device_id gpio_nand_plat_id_table[] = {
> 	                /* sentinel */
> 	        },
> 	 };
> 	-MODULE_DEVICE_TABLE(of, gpio_nand_plat_id_table);
> 	+MODULE_DEVICE_TABLE(platform, gpio_nand_plat_id_table);

Evidently a copy-paste error on my side, sorry for that.

Acked-by: Janusz Krzysztofik <jmkrzyszt@gmail.com>

Thanks,
Janusz

>  
> 	 static struct platform_driver gpio_nand_driver = {
> 	        .probe          = gpio_nand_probe,
> 
> 
> Thanks,
> Miquèl
> 

linux-next: build failure after merge of the nand tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1200 bytes --]

Hi all,

After merging the nand tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/mtd/nand/raw/cadence-nand-controller.c: In function 'cadence_nand_read_buf':
drivers/mtd/nand/raw/cadence-nand-controller.c:1893:25: error: implicit declaration of function 'ioread64_rep'; did you mean 'ioread32_rep'? [-Werror=implicit-function-declaration]
 1893 |                         ioread64_rep(cdns_ctrl->io.virt, buf, len_in_words);
      |                         ^~~~~~~~~~~~
      |                         ioread32_rep
drivers/mtd/nand/raw/cadence-nand-controller.c: In function 'cadence_nand_write_buf':
drivers/mtd/nand/raw/cadence-nand-controller.c:1962:25: error: implicit declaration of function 'iowrite64_rep'; did you mean 'iowrite32_rep'? [-Werror=implicit-function-declaration]
 1962 |                         iowrite64_rep(cdns_ctrl->io.virt, buf, len_in_words);
      |                         ^~~~~~~~~~~~~
      |                         iowrite32_rep

Caused by commit

  7e7dc04774b1 ("mtd: rawnand: cadence: support 64-bit slave dma interface")

I have used the nand tree from next-20220920 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the nand tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 499 bytes --]

Hi all,

After merging the nand tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/mtd/nand/raw/intel-nand-controller.c:17:10: fatal error: linux/mtd/nand_ecc.h: No such file or directory
   17 | #include <linux/mtd/nand_ecc.h>
      |          ^~~~~~~~~~~~~~~~~~~~~~

Caused by commit

  613b6e4e3baa ("mtd: rawnand: Add NAND controller support on Intel LGM SoC")

I have used the nand tree from next-20201207 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the nand tree

[Miquel Raynal]

Hello,

Alex Dewar <alex.dewar90@gmail.com> wrote on Mon, 14 Sep 2020 10:50:41
+0100:

> On Mon, Sep 14, 2020 at 11:45:52AM +1000, Stephen Rothwell wrote:
> > Hi all,
> > 
> > After merging the nand tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > drivers/mtd/nand/onenand/onenand_omap2.c:27:10: fatal error: asm/mach/flash.h: No such file or directory
> >    27 | #include <asm/mach/flash.h>
> >       |          ^~~~~~~~~~~~~~~~~~
> > 
> > Caused by commit
> > 
> >   26e1a8efc63d ("mtd: onenand: omap2: Allow for compile-testing on !ARM")
> > 
> > I have reverted that commit for today.
> 
> Gah, sorry :(. I definitely *tried* to build test it, but I must have
> messed up and built the wrong tree or something.
> 
> Apologies,
> Alex
> 
> > 
> > -- 
> > Cheers,
> > Stephen Rothwell
> 
> 

I'll drop this patch for now, we'll try to have it for the next release
if Alex fixes it.

Thanks,
Miquèl

Re: linux-next: build failure after merge of the nand tree

[Alex Dewar]

On Mon, Sep 14, 2020 at 11:45:52AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the nand tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/mtd/nand/onenand/onenand_omap2.c:27:10: fatal error: asm/mach/flash.h: No such file or directory
>    27 | #include <asm/mach/flash.h>
>       |          ^~~~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   26e1a8efc63d ("mtd: onenand: omap2: Allow for compile-testing on !ARM")
> 
> I have reverted that commit for today.

Gah, sorry :(. I definitely *tried* to build test it, but I must have
messed up and built the wrong tree or something.

Apologies,
Alex

> 
> -- 
> Cheers,
> Stephen Rothwell

linux-next: build failure after merge of the nand tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 462 bytes --]

Hi all,

After merging the nand tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/mtd/nand/onenand/onenand_omap2.c:27:10: fatal error: asm/mach/flash.h: No such file or directory
   27 | #include <asm/mach/flash.h>
      |          ^~~~~~~~~~~~~~~~~~

Caused by commit

  26e1a8efc63d ("mtd: onenand: omap2: Allow for compile-testing on !ARM")

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the nand tree

[Miquel Raynal]

Hi Stephen,

Stephen Rothwell <sfr@canb.auug.org.au> wrote on Thu, 10 Sep 2020
14:12:52 +1000:

> Hi all,
> 
> On Tue, 8 Sep 2020 13:35:36 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> >
> > After merging the nand tree, today's linux-next build (arm
> > multi_v7_defconfig) failed like this:
> > 
> > drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c: In function 'common_nfc_set_geometry':
> > drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c:513:33: error: 'chip' undeclared (first use in this function)
> >   513 |   nanddev_get_ecc_requirements(&chip->base);
> >       |                                 ^~~~
> > drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c:513:33: note: each undeclared identifier is reported only once for each function it appears in
> > 
> > Caused by commit
> > 
> >   aa5faaa5f95c ("mtd: rawnand: Use nanddev_get/set_ecc_requirements() when relevant")
> > 
> > I have used the nand tree from next-20200903 for today.  
> 
> I am still getting this failure.
> 

I am very sorry for all these errors, As usual, I pushed this branch to
my 0-day repository last Thursday and got a green light. But it
regularly happens, like this week, that I received an error report
even after that. This time the robot discovered the mistake at the
same time as you...

Anyway, it is now fixed and I pushed a hopefully fine nand/next branch.

As always, thank you very much for your time.
Miquèl

Re: linux-next: build failure after merge of the nand tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 892 bytes --]

Hi all,

On Tue, 8 Sep 2020 13:35:36 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the nand tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c: In function 'common_nfc_set_geometry':
> drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c:513:33: error: 'chip' undeclared (first use in this function)
>   513 |   nanddev_get_ecc_requirements(&chip->base);
>       |                                 ^~~~
> drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c:513:33: note: each undeclared identifier is reported only once for each function it appears in
> 
> Caused by commit
> 
>   aa5faaa5f95c ("mtd: rawnand: Use nanddev_get/set_ecc_requirements() when relevant")
> 
> I have used the nand tree from next-20200903 for today.

I am still getting this failure.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: build failure after merge of the nand tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 743 bytes --]

Hi all,

After merging the nand tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c: In function 'common_nfc_set_geometry':
drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c:513:33: error: 'chip' undeclared (first use in this function)
  513 |   nanddev_get_ecc_requirements(&chip->base);
      |                                 ^~~~
drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c:513:33: note: each undeclared identifier is reported only once for each function it appears in

Caused by commit

  aa5faaa5f95c ("mtd: rawnand: Use nanddev_get/set_ecc_requirements() when relevant")

I have used the nand tree from next-20200903 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the nand tree

[Miquel Raynal]

Hi Stephen,

Stephen Rothwell <sfr@canb.auug.org.au> wrote on Mon, 25 May 2020
20:45:35 +1000:

> Hi all,
> 
> After merging the nand tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/mtd/nand/raw/pasemi_nand.c: In function 'pasemi_nand_probe':
> drivers/mtd/nand/raw/pasemi_nand.c:157:1: warning: label 'out_cleanup' defined but not used [-Wunused-label]
>   157 | out_cleanup:
>       | ^~~~~~~~~~~
> drivers/mtd/nand/raw/pasemi_nand.c:149:3: error: label 'out_cleanup_nand' used but not defined
>   149 |   goto out_cleanup_nand;
>       |   ^~~~
> 
> Caused by commit
> 
>   d6a2207d79e3 ("mtd: rawnand: pasemi: Fix the probe error path")
> 
> I have applied the following patch for today.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Mon, 25 May 2020 20:41:22 +1000
> Subject: [PATCH] mtd: rawnand: pasemi: fix up label spelling
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/mtd/nand/raw/pasemi_nand.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/mtd/nand/raw/pasemi_nand.c b/drivers/mtd/nand/raw/pasemi_nand.c
> index 37570f0c3a36..d8eca8c3fdcd 100644
> --- a/drivers/mtd/nand/raw/pasemi_nand.c
> +++ b/drivers/mtd/nand/raw/pasemi_nand.c
> @@ -154,7 +154,7 @@ static int pasemi_nand_probe(struct platform_device *ofdev)
>  
>  	return 0;
>  
> -out_cleanup:
> + out_cleanup_nand:
>  	nand_cleanup(chip);
>   out_lpc:
>  	release_region(lpcctl, 4);

Damn it, I always screw up with !COMPILE_TEST drivers...

That's the right fix, I updated nand/next for tomorrow.

Thanks a lot,
Miquèl

linux-next: build failure after merge of the nand tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1383 bytes --]

Hi all,

After merging the nand tree, today's linux-next build (powerpc
allyesconfig) failed like this:

drivers/mtd/nand/raw/pasemi_nand.c: In function 'pasemi_nand_probe':
drivers/mtd/nand/raw/pasemi_nand.c:157:1: warning: label 'out_cleanup' defined but not used [-Wunused-label]
  157 | out_cleanup:
      | ^~~~~~~~~~~
drivers/mtd/nand/raw/pasemi_nand.c:149:3: error: label 'out_cleanup_nand' used but not defined
  149 |   goto out_cleanup_nand;
      |   ^~~~

Caused by commit

  d6a2207d79e3 ("mtd: rawnand: pasemi: Fix the probe error path")

I have applied the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 25 May 2020 20:41:22 +1000
Subject: [PATCH] mtd: rawnand: pasemi: fix up label spelling

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/mtd/nand/raw/pasemi_nand.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/mtd/nand/raw/pasemi_nand.c b/drivers/mtd/nand/raw/pasemi_nand.c
index 37570f0c3a36..d8eca8c3fdcd 100644
--- a/drivers/mtd/nand/raw/pasemi_nand.c
+++ b/drivers/mtd/nand/raw/pasemi_nand.c
@@ -154,7 +154,7 @@ static int pasemi_nand_probe(struct platform_device *ofdev)
 
 	return 0;
 
-out_cleanup:
+ out_cleanup_nand:
 	nand_cleanup(chip);
  out_lpc:
 	release_region(lpcctl, 4);
-- 
2.26.2

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the nand tree

[Miquel Raynal]

Hi Stephen,

Stephen Rothwell <sfr@canb.auug.org.au> wrote on Tue, 12 May 2020
14:08:40 +1000:

> Hi all,
> 
> After merging the nand tree, today's linux-next build (arm
> multi_v7_defconfig) failed like this:
> 
> drivers/mtd/nand/raw/stm32_fmc2_nand.c: In function 'stm32_fmc2_nfc_write_data':
> drivers/mtd/nand/raw/stm32_fmc2_nand.c:1294:34: error: 'fmc2' undeclared (first use in this function)
>  1294 |   stm32_fmc2_nfc_set_buswidth_16(fmc2, true);
>       |                                  ^~~~
> drivers/mtd/nand/raw/stm32_fmc2_nand.c:1294:34: note: each undeclared identifier is reported only once for each function it appears in
> 
> Caused by commit
> 
>   6c1c863ca431 ("mtd: rawnand: stm32_fmc2: cleanup")
> 
> I have used the nand tree from next-20200511 for today.
> 

Thanks for the notice, we will fix it by tomorrow.


Thanks,
Miquèl

linux-next: build failure after merge of the nand tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 704 bytes --]

Hi all,

After merging the nand tree, today's linux-next build (arm
multi_v7_defconfig) failed like this:

drivers/mtd/nand/raw/stm32_fmc2_nand.c: In function 'stm32_fmc2_nfc_write_data':
drivers/mtd/nand/raw/stm32_fmc2_nand.c:1294:34: error: 'fmc2' undeclared (first use in this function)
 1294 |   stm32_fmc2_nfc_set_buswidth_16(fmc2, true);
      |                                  ^~~~
drivers/mtd/nand/raw/stm32_fmc2_nand.c:1294:34: note: each undeclared identifier is reported only once for each function it appears in

Caused by commit

  6c1c863ca431 ("mtd: rawnand: stm32_fmc2: cleanup")

I have used the nand tree from next-20200511 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

Re: linux-next: build failure after merge of the nand tree

[Miquel Raynal]

Hi Paul,

Paul Cercueil <paul@crapouillou.net> wrote on Tue, 02 Apr 2019 14:00:14
+0200:

> Hi Miquel,
> 
> Le mar. 2 avril 2019 à 13:56, Miquel Raynal <miquel.raynal@bootlin.com> a écrit :
> > Hi Paul,
> > 
> > Paul Cercueil <paul@crapouillou.net> wrote on Tue, 02 Apr 2019 > 01:31:52
> > +0200:
> >   
> >>  Hi Stephen,  
> >> >>  Le mar. 2 avril 2019 à 1:14, Stephen Rothwell >> <sfr@canb.auug.org.au> a écrit :  
> >>  > Hi all,
> >>  >
> >>  > After merging the nand tree, today's linux-next build (x86_64
> >>  > allmodconfig) failed like this:
> >>  >
> >>  > drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:26:5: error: >> redefinition > of 'ingenic_ecc_calculate'
> >>  >  int ingenic_ecc_calculate(struct ingenic_ecc *ecc,
> >>  >      ^~~~~~~~~~~~~~~~~~~~~
> >>  > In file included from >> drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:14:
> >>  > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:39:5: note: previous > >> definition of 'ingenic_ecc_calculate' was here
> >>  >  int ingenic_ecc_calculate(struct ingenic_ecc *ecc,
> >>  >      ^~~~~~~~~~~~~~~~~~~~~
> >>  > drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:47:5: error: >> redefinition > of 'ingenic_ecc_correct'
> >>  >  int ingenic_ecc_correct(struct ingenic_ecc *ecc,
> >>  >      ^~~~~~~~~~~~~~~~~~~
> >>  > In file included from >> drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:14:
> >>  > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:46:5: note: previous > >> definition of 'ingenic_ecc_correct' was here
> >>  >  int ingenic_ecc_correct(struct ingenic_ecc *ecc,
> >>  >      ^~~~~~~~~~~~~~~~~~~
> >>  > drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:93:21: error: >> redefinition > of 'of_ingenic_ecc_get'
> >>  >  struct ingenic_ecc *of_ingenic_ecc_get(struct device_node >> *of_node)
> >>  >                      ^~~~~~~~~~~~~~~~~~
> >>  > In file included from >> drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:14:
> >>  > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:57:21: note: previous >> > definition of 'of_ingenic_ecc_get' was here
> >>  >  struct ingenic_ecc *of_ingenic_ecc_get(struct device_node *np)
> >>  >                      ^~~~~~~~~~~~~~~~~~
> >>  > drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:119:6: error: >> redefinition > of 'ingenic_ecc_release'
> >>  >  void ingenic_ecc_release(struct ingenic_ecc *ecc)
> >>  >       ^~~~~~~~~~~~~~~~~~~
> >>  > In file included from >> drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:14:
> >>  > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:53:6: note: previous > >> definition of 'ingenic_ecc_release' was here
> >>  >  void ingenic_ecc_release(struct ingenic_ecc *ecc)
> >>  >       ^~~~~~~~~~~~~~~~~~~
> >>  >
> >>  > Caused by commit
> >>  >
> >>  >   8278ad0d709a ("mtd: rawnand: ingenic: Separate top-level and >> SoC > specific code")
> >>  >
> >>  > I have used the nand tree from next-20190401 for today.  
> >> >>  That makes no sense to me; from the offsets of the errors in the >> ingenic_ecc.h  
> >>  file, it seems that CONFIG_MTD_NAND_INGENIC_ECC is not set, and in >> this case
> >>  ingenic_ecc.c should not be compiled at all.  
> >> > > I think  
> > 
> >         #ifdef FOO
> > 
> > evaluates to true if
> > 
> >         FOO=y
> > 
> > while we can have
> > 
> >         FOO=m
> > 
> > which is evaluated to false, hence the double definition with
> > allmodconfig.  
> 
> That's good to know, I guess I'll have to start using IS_DEFINED()
> from now on.
> 
> > Here is a diff solving the issue, if you are fine with it I will
> > correct in-place and push -f nand/next for tomorrow's build.  
> 
> That would be great.

Done. I also pushed on 0-day, hope I'll have the notification before
tonight.


Thanks,
Miquèl

Re: linux-next: build failure after merge of the nand tree

[Paul Cercueil]

Hi Miquel,

Le mar. 2 avril 2019 à 13:56, Miquel Raynal 
<miquel.raynal@bootlin.com> a écrit :
> Hi Paul,
> 
> Paul Cercueil <paul@crapouillou.net> wrote on Tue, 02 Apr 2019 
> 01:31:52
> +0200:
> 
>>  Hi Stephen,
>> 
>>  Le mar. 2 avril 2019 à 1:14, Stephen Rothwell 
>> <sfr@canb.auug.org.au> a écrit :
>>  > Hi all,
>>  >
>>  > After merging the nand tree, today's linux-next build (x86_64
>>  > allmodconfig) failed like this:
>>  >
>>  > drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:26:5: error: 
>> redefinition > of 'ingenic_ecc_calculate'
>>  >  int ingenic_ecc_calculate(struct ingenic_ecc *ecc,
>>  >      ^~~~~~~~~~~~~~~~~~~~~
>>  > In file included from 
>> drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:14:
>>  > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:39:5: note: previous > 
>> definition of 'ingenic_ecc_calculate' was here
>>  >  int ingenic_ecc_calculate(struct ingenic_ecc *ecc,
>>  >      ^~~~~~~~~~~~~~~~~~~~~
>>  > drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:47:5: error: 
>> redefinition > of 'ingenic_ecc_correct'
>>  >  int ingenic_ecc_correct(struct ingenic_ecc *ecc,
>>  >      ^~~~~~~~~~~~~~~~~~~
>>  > In file included from 
>> drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:14:
>>  > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:46:5: note: previous > 
>> definition of 'ingenic_ecc_correct' was here
>>  >  int ingenic_ecc_correct(struct ingenic_ecc *ecc,
>>  >      ^~~~~~~~~~~~~~~~~~~
>>  > drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:93:21: error: 
>> redefinition > of 'of_ingenic_ecc_get'
>>  >  struct ingenic_ecc *of_ingenic_ecc_get(struct device_node 
>> *of_node)
>>  >                      ^~~~~~~~~~~~~~~~~~
>>  > In file included from 
>> drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:14:
>>  > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:57:21: note: previous 
>> > definition of 'of_ingenic_ecc_get' was here
>>  >  struct ingenic_ecc *of_ingenic_ecc_get(struct device_node *np)
>>  >                      ^~~~~~~~~~~~~~~~~~
>>  > drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:119:6: error: 
>> redefinition > of 'ingenic_ecc_release'
>>  >  void ingenic_ecc_release(struct ingenic_ecc *ecc)
>>  >       ^~~~~~~~~~~~~~~~~~~
>>  > In file included from 
>> drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:14:
>>  > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:53:6: note: previous > 
>> definition of 'ingenic_ecc_release' was here
>>  >  void ingenic_ecc_release(struct ingenic_ecc *ecc)
>>  >       ^~~~~~~~~~~~~~~~~~~
>>  >
>>  > Caused by commit
>>  >
>>  >   8278ad0d709a ("mtd: rawnand: ingenic: Separate top-level and 
>> SoC > specific code")
>>  >
>>  > I have used the nand tree from next-20190401 for today.
>> 
>>  That makes no sense to me; from the offsets of the errors in the 
>> ingenic_ecc.h
>>  file, it seems that CONFIG_MTD_NAND_INGENIC_ECC is not set, and in 
>> this case
>>  ingenic_ecc.c should not be compiled at all.
>> 
> 
> I think
> 
>         #ifdef FOO
> 
> evaluates to true if
> 
>         FOO=y
> 
> while we can have
> 
>         FOO=m
> 
> which is evaluated to false, hence the double definition with
> allmodconfig.

That's good to know, I guess I'll have to start using IS_DEFINED()
from now on.

> Here is a diff solving the issue, if you are fine with it I will
> correct in-place and push -f nand/next for tomorrow's build.

That would be great.

Thanks!
-Paul

> ---8<---
> diff --git a/drivers/mtd/nand/raw/ingenic/ingenic_ecc.h 
> b/drivers/mtd/nand/raw/ingenic/ingenic_ecc.h
> index d0486f963cc9..2cda439b5e11 100644
> --- a/drivers/mtd/nand/raw/ingenic/ingenic_ecc.h
> +++ b/drivers/mtd/nand/raw/ingenic/ingenic_ecc.h
> @@ -25,7 +25,7 @@ struct ingenic_ecc_params {
>         int strength;
>  };
> 
> -#ifdef CONFIG_MTD_NAND_INGENIC_ECC
> +#if IS_ENABLED(CONFIG_MTD_NAND_INGENIC_ECC)
>  int ingenic_ecc_calculate(struct ingenic_ecc *ecc,
>                           struct ingenic_ecc_params *params,
>                           const u8 *buf, u8 *ecc_code);
> --->8---
> 
> 
> Thanks,
> Miquèl
> 

Re: linux-next: build failure after merge of the nand tree

[Miquel Raynal]

Hi Paul,

Paul Cercueil <paul@crapouillou.net> wrote on Tue, 02 Apr 2019 01:31:52
+0200:

> Hi Stephen,
> 
> Le mar. 2 avril 2019 à 1:14, Stephen Rothwell <sfr@canb.auug.org.au> a écrit :
> > Hi all,
> > 
> > After merging the nand tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:26:5: error: redefinition > of 'ingenic_ecc_calculate'
> >  int ingenic_ecc_calculate(struct ingenic_ecc *ecc,
> >      ^~~~~~~~~~~~~~~~~~~~~
> > In file included from drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:14:
> > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:39:5: note: previous > definition of 'ingenic_ecc_calculate' was here
> >  int ingenic_ecc_calculate(struct ingenic_ecc *ecc,
> >      ^~~~~~~~~~~~~~~~~~~~~
> > drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:47:5: error: redefinition > of 'ingenic_ecc_correct'
> >  int ingenic_ecc_correct(struct ingenic_ecc *ecc,
> >      ^~~~~~~~~~~~~~~~~~~
> > In file included from drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:14:
> > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:46:5: note: previous > definition of 'ingenic_ecc_correct' was here
> >  int ingenic_ecc_correct(struct ingenic_ecc *ecc,
> >      ^~~~~~~~~~~~~~~~~~~
> > drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:93:21: error: redefinition > of 'of_ingenic_ecc_get'
> >  struct ingenic_ecc *of_ingenic_ecc_get(struct device_node *of_node)
> >                      ^~~~~~~~~~~~~~~~~~
> > In file included from drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:14:
> > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:57:21: note: previous > definition of 'of_ingenic_ecc_get' was here
> >  struct ingenic_ecc *of_ingenic_ecc_get(struct device_node *np)
> >                      ^~~~~~~~~~~~~~~~~~
> > drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:119:6: error: redefinition > of 'ingenic_ecc_release'
> >  void ingenic_ecc_release(struct ingenic_ecc *ecc)
> >       ^~~~~~~~~~~~~~~~~~~
> > In file included from drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:14:
> > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:53:6: note: previous > definition of 'ingenic_ecc_release' was here
> >  void ingenic_ecc_release(struct ingenic_ecc *ecc)
> >       ^~~~~~~~~~~~~~~~~~~
> > 
> > Caused by commit
> > 
> >   8278ad0d709a ("mtd: rawnand: ingenic: Separate top-level and SoC > specific code")
> > 
> > I have used the nand tree from next-20190401 for today.  
> 
> That makes no sense to me; from the offsets of the errors in the ingenic_ecc.h
> file, it seems that CONFIG_MTD_NAND_INGENIC_ECC is not set, and in this case
> ingenic_ecc.c should not be compiled at all.
> 

I think

        #ifdef FOO

evaluates to true if

        FOO=y

while we can have

        FOO=m

which is evaluated to false, hence the double definition with
allmodconfig.

Here is a diff solving the issue, if you are fine with it I will
correct in-place and push -f nand/next for tomorrow's build.

---8<---
diff --git a/drivers/mtd/nand/raw/ingenic/ingenic_ecc.h b/drivers/mtd/nand/raw/ingenic/ingenic_ecc.h
index d0486f963cc9..2cda439b5e11 100644
--- a/drivers/mtd/nand/raw/ingenic/ingenic_ecc.h
+++ b/drivers/mtd/nand/raw/ingenic/ingenic_ecc.h
@@ -25,7 +25,7 @@ struct ingenic_ecc_params {
        int strength;
 };
 
-#ifdef CONFIG_MTD_NAND_INGENIC_ECC
+#if IS_ENABLED(CONFIG_MTD_NAND_INGENIC_ECC)
 int ingenic_ecc_calculate(struct ingenic_ecc *ecc,
                          struct ingenic_ecc_params *params,
                          const u8 *buf, u8 *ecc_code);
--->8---


Thanks,
Miquèl

Re: linux-next: build failure after merge of the nand tree

[Miquel Raynal]

Hi Paul,

Miquel Raynal <miquel.raynal@bootlin.com> wrote on Tue, 2 Apr 2019
09:27:47 +0200:

> Hi Paul,
> 
> Paul Cercueil <paul@crapouillou.net> wrote on Tue, 02 Apr 2019 01:31:52
> +0200:
> 
> > Hi Stephen,
> > 
> > Le mar. 2 avril 2019 à 1:14, Stephen Rothwell <sfr@canb.auug.org.au> a écrit :  
> > > Hi all,
> > > 
> > > After merging the nand tree, today's linux-next build (x86_64
> > > allmodconfig) failed like this:
> > > 
> > > drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:26:5: error: redefinition > of 'ingenic_ecc_calculate'
> > >  int ingenic_ecc_calculate(struct ingenic_ecc *ecc,
> > >      ^~~~~~~~~~~~~~~~~~~~~
> > > In file included from drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:14:
> > > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:39:5: note: previous > definition of 'ingenic_ecc_calculate' was here
> > >  int ingenic_ecc_calculate(struct ingenic_ecc *ecc,
> > >      ^~~~~~~~~~~~~~~~~~~~~
> > > drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:47:5: error: redefinition > of 'ingenic_ecc_correct'
> > >  int ingenic_ecc_correct(struct ingenic_ecc *ecc,
> > >      ^~~~~~~~~~~~~~~~~~~
> > > In file included from drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:14:
> > > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:46:5: note: previous > definition of 'ingenic_ecc_correct' was here
> > >  int ingenic_ecc_correct(struct ingenic_ecc *ecc,
> > >      ^~~~~~~~~~~~~~~~~~~
> > > drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:93:21: error: redefinition > of 'of_ingenic_ecc_get'
> > >  struct ingenic_ecc *of_ingenic_ecc_get(struct device_node *of_node)
> > >                      ^~~~~~~~~~~~~~~~~~
> > > In file included from drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:14:
> > > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:57:21: note: previous > definition of 'of_ingenic_ecc_get' was here
> > >  struct ingenic_ecc *of_ingenic_ecc_get(struct device_node *np)
> > >                      ^~~~~~~~~~~~~~~~~~
> > > drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:119:6: error: redefinition > of 'ingenic_ecc_release'
> > >  void ingenic_ecc_release(struct ingenic_ecc *ecc)
> > >       ^~~~~~~~~~~~~~~~~~~
> > > In file included from drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:14:
> > > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:53:6: note: previous > definition of 'ingenic_ecc_release' was here
> > >  void ingenic_ecc_release(struct ingenic_ecc *ecc)
> > >       ^~~~~~~~~~~~~~~~~~~
> > > 
> > > Caused by commit
> > > 
> > >   8278ad0d709a ("mtd: rawnand: ingenic: Separate top-level and SoC > specific code")
> > > 
> > > I have used the nand tree from next-20190401 for today.    
> > 
> > That makes no sense to me; from the offsets of the errors in the ingenic_ecc.h
> > file, it seems that CONFIG_MTD_NAND_INGENIC_ECC is not set, and in this case
> > ingenic_ecc.c should not be compiled at all.
> > 
> > -Paul
> > 
> >   
> 
> There must be a mistmatch somewhere in Kconfig, please reproduce with
> allmodconfig on x86_64, I don't have time to check on this today.
> Otherwise I'll have to drop the patchset :/

I wonder if the root cause comes from another patchset (mine, actually)
which I applied on top of your work. Maybe there is a conflict there. I
am looking into it.


Thanks,
Miquèl

Re: linux-next: build failure after merge of the nand tree

[Miquel Raynal]

Hi Paul,

Paul Cercueil <paul@crapouillou.net> wrote on Tue, 02 Apr 2019 01:31:52
+0200:

> Hi Stephen,
> 
> Le mar. 2 avril 2019 à 1:14, Stephen Rothwell <sfr@canb.auug.org.au> a écrit :
> > Hi all,
> > 
> > After merging the nand tree, today's linux-next build (x86_64
> > allmodconfig) failed like this:
> > 
> > drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:26:5: error: redefinition > of 'ingenic_ecc_calculate'
> >  int ingenic_ecc_calculate(struct ingenic_ecc *ecc,
> >      ^~~~~~~~~~~~~~~~~~~~~
> > In file included from drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:14:
> > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:39:5: note: previous > definition of 'ingenic_ecc_calculate' was here
> >  int ingenic_ecc_calculate(struct ingenic_ecc *ecc,
> >      ^~~~~~~~~~~~~~~~~~~~~
> > drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:47:5: error: redefinition > of 'ingenic_ecc_correct'
> >  int ingenic_ecc_correct(struct ingenic_ecc *ecc,
> >      ^~~~~~~~~~~~~~~~~~~
> > In file included from drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:14:
> > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:46:5: note: previous > definition of 'ingenic_ecc_correct' was here
> >  int ingenic_ecc_correct(struct ingenic_ecc *ecc,
> >      ^~~~~~~~~~~~~~~~~~~
> > drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:93:21: error: redefinition > of 'of_ingenic_ecc_get'
> >  struct ingenic_ecc *of_ingenic_ecc_get(struct device_node *of_node)
> >                      ^~~~~~~~~~~~~~~~~~
> > In file included from drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:14:
> > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:57:21: note: previous > definition of 'of_ingenic_ecc_get' was here
> >  struct ingenic_ecc *of_ingenic_ecc_get(struct device_node *np)
> >                      ^~~~~~~~~~~~~~~~~~
> > drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:119:6: error: redefinition > of 'ingenic_ecc_release'
> >  void ingenic_ecc_release(struct ingenic_ecc *ecc)
> >       ^~~~~~~~~~~~~~~~~~~
> > In file included from drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:14:
> > drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:53:6: note: previous > definition of 'ingenic_ecc_release' was here
> >  void ingenic_ecc_release(struct ingenic_ecc *ecc)
> >       ^~~~~~~~~~~~~~~~~~~
> > 
> > Caused by commit
> > 
> >   8278ad0d709a ("mtd: rawnand: ingenic: Separate top-level and SoC > specific code")
> > 
> > I have used the nand tree from next-20190401 for today.  
> 
> That makes no sense to me; from the offsets of the errors in the ingenic_ecc.h
> file, it seems that CONFIG_MTD_NAND_INGENIC_ECC is not set, and in this case
> ingenic_ecc.c should not be compiled at all.
> 
> -Paul
> 
> 

There must be a mistmatch somewhere in Kconfig, please reproduce with
allmodconfig on x86_64, I don't have time to check on this today.
Otherwise I'll have to drop the patchset :/


Thanks,
Miquèl

Re: linux-next: build failure after merge of the nand tree

[Paul Cercueil]

Hi Stephen,

Le mar. 2 avril 2019 à 1:14, Stephen Rothwell <sfr@canb.auug.org.au> a 
écrit :
> Hi all,
> 
> After merging the nand tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:26:5: error: redefinition 
> of 'ingenic_ecc_calculate'
>  int ingenic_ecc_calculate(struct ingenic_ecc *ecc,
>      ^~~~~~~~~~~~~~~~~~~~~
> In file included from drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:14:
> drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:39:5: note: previous 
> definition of 'ingenic_ecc_calculate' was here
>  int ingenic_ecc_calculate(struct ingenic_ecc *ecc,
>      ^~~~~~~~~~~~~~~~~~~~~
> drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:47:5: error: redefinition 
> of 'ingenic_ecc_correct'
>  int ingenic_ecc_correct(struct ingenic_ecc *ecc,
>      ^~~~~~~~~~~~~~~~~~~
> In file included from drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:14:
> drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:46:5: note: previous 
> definition of 'ingenic_ecc_correct' was here
>  int ingenic_ecc_correct(struct ingenic_ecc *ecc,
>      ^~~~~~~~~~~~~~~~~~~
> drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:93:21: error: redefinition 
> of 'of_ingenic_ecc_get'
>  struct ingenic_ecc *of_ingenic_ecc_get(struct device_node *of_node)
>                      ^~~~~~~~~~~~~~~~~~
> In file included from drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:14:
> drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:57:21: note: previous 
> definition of 'of_ingenic_ecc_get' was here
>  struct ingenic_ecc *of_ingenic_ecc_get(struct device_node *np)
>                      ^~~~~~~~~~~~~~~~~~
> drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:119:6: error: redefinition 
> of 'ingenic_ecc_release'
>  void ingenic_ecc_release(struct ingenic_ecc *ecc)
>       ^~~~~~~~~~~~~~~~~~~
> In file included from drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:14:
> drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:53:6: note: previous 
> definition of 'ingenic_ecc_release' was here
>  void ingenic_ecc_release(struct ingenic_ecc *ecc)
>       ^~~~~~~~~~~~~~~~~~~
> 
> Caused by commit
> 
>   8278ad0d709a ("mtd: rawnand: ingenic: Separate top-level and SoC 
> specific code")
> 
> I have used the nand tree from next-20190401 for today.

That makes no sense to me; from the offsets of the errors in the 
ingenic_ecc.h
file, it seems that CONFIG_MTD_NAND_INGENIC_ECC is not set, and in this 
case
ingenic_ecc.c should not be compiled at all.

-Paul

linux-next: build failure after merge of the nand tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 2104 bytes --]

Hi all,

After merging the nand tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:26:5: error: redefinition of 'ingenic_ecc_calculate'
 int ingenic_ecc_calculate(struct ingenic_ecc *ecc,
     ^~~~~~~~~~~~~~~~~~~~~
In file included from drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:14:
drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:39:5: note: previous definition of 'ingenic_ecc_calculate' was here
 int ingenic_ecc_calculate(struct ingenic_ecc *ecc,
     ^~~~~~~~~~~~~~~~~~~~~
drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:47:5: error: redefinition of 'ingenic_ecc_correct'
 int ingenic_ecc_correct(struct ingenic_ecc *ecc,
     ^~~~~~~~~~~~~~~~~~~
In file included from drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:14:
drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:46:5: note: previous definition of 'ingenic_ecc_correct' was here
 int ingenic_ecc_correct(struct ingenic_ecc *ecc,
     ^~~~~~~~~~~~~~~~~~~
drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:93:21: error: redefinition of 'of_ingenic_ecc_get'
 struct ingenic_ecc *of_ingenic_ecc_get(struct device_node *of_node)
                     ^~~~~~~~~~~~~~~~~~
In file included from drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:14:
drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:57:21: note: previous definition of 'of_ingenic_ecc_get' was here
 struct ingenic_ecc *of_ingenic_ecc_get(struct device_node *np)
                     ^~~~~~~~~~~~~~~~~~
drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:119:6: error: redefinition of 'ingenic_ecc_release'
 void ingenic_ecc_release(struct ingenic_ecc *ecc)
      ^~~~~~~~~~~~~~~~~~~
In file included from drivers/mtd/nand/raw/ingenic/ingenic_ecc.c:14:
drivers/mtd/nand/raw/ingenic/ingenic_ecc.h:53:6: note: previous definition of 'ingenic_ecc_release' was here
 void ingenic_ecc_release(struct ingenic_ecc *ecc)
      ^~~~~~~~~~~~~~~~~~~

Caused by commit

  8278ad0d709a ("mtd: rawnand: ingenic: Separate top-level and SoC specific code")

I have used the nand tree from next-20190401 for today.

-- 
Cheers,
Stephen Rothwell

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]