* [PATCH 1/2] ARM: omap1: add nand_chip declaration
@ 2018-09-26 13:04 Arnd Bergmann
2018-09-26 13:04 ` [PATCH 2/2] ARM: ixp4xx: include linux/mtd/platnand.h Arnd Bergmann
2018-09-26 13:23 ` [PATCH 1/2] ARM: omap1: add nand_chip declaration Miquel Raynal
0 siblings, 2 replies; 6+ messages in thread
From: Arnd Bergmann @ 2018-09-26 13:04 UTC (permalink / raw)
To: linux-arm-kernel
Recent MTD changes caused a minor build regression on OMAP1:
In file included from arch/arm/mach-omap1/devices.c:31:
arch/arm/mach-omap1/common.h:85:39: error: 'struct nand_chip' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
Fixes: 1002aed789bc ("mtd: rawnand: plat_nand: Pass a nand_chip object to all platform_nand_ctrl hooks")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/mach-omap1/common.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-omap1/common.h b/arch/arm/mach-omap1/common.h
index 11b87a4c84d4..82f2c065040a 100644
--- a/arch/arm/mach-omap1/common.h
+++ b/arch/arm/mach-omap1/common.h
@@ -82,6 +82,7 @@ void omap1_restart(enum reboot_mode, const char *);
extern void __init omap_check_revision(void);
+struct nand_chip;
extern void omap1_nand_cmd_ctl(struct nand_chip *this, int cmd,
unsigned int ctrl);
--
2.18.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] ARM: ixp4xx: include linux/mtd/platnand.h
2018-09-26 13:04 [PATCH 1/2] ARM: omap1: add nand_chip declaration Arnd Bergmann
@ 2018-09-26 13:04 ` Arnd Bergmann
2018-09-26 13:24 ` Miquel Raynal
` (2 more replies)
2018-09-26 13:23 ` [PATCH 1/2] ARM: omap1: add nand_chip declaration Miquel Raynal
1 sibling, 3 replies; 6+ messages in thread
From: Arnd Bergmann @ 2018-09-26 13:04 UTC (permalink / raw)
To: linux-arm-kernel
The platform_nand_data structure definition is required for ixdp425
but has now moved to a new header file:
arch/arm/mach-ixp4xx/ixdp425-setup.c:98:15: error: variable 'ixdp425_flash_nand_data' has initializer but incomplete type
static struct platform_nand_data ixdp425_flash_nand_data = {
^~~~~~~~~~~~~~~~~~
arch/arm/mach-ixp4xx/ixdp425-setup.c:99:3: error: 'struct platform_nand_data' has no member named 'chip'
Fixes: 19cf5dfa3a31 ("mtd: rawnand: Move platform_nand_xxx definitions out of rawnand.h")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm/mach-ixp4xx/ixdp425-setup.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c
index 797e7edc7124..57d7df79d838 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -20,6 +20,7 @@
#include <linux/mtd/mtd.h>
#include <linux/mtd/rawnand.h>
#include <linux/mtd/partitions.h>
+#include <linux/mtd/platnand.h>
#include <linux/delay.h>
#include <linux/gpio.h>
#include <asm/types.h>
--
2.18.0
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/2] ARM: ixp4xx: include linux/mtd/platnand.h
2018-09-26 13:04 ` [PATCH 2/2] ARM: ixp4xx: include linux/mtd/platnand.h Arnd Bergmann
@ 2018-09-26 13:24 ` Miquel Raynal
2018-10-01 11:46 ` Krzysztof Hałasa
2018-10-05 14:37 ` Miquel Raynal
2 siblings, 0 replies; 6+ messages in thread
From: Miquel Raynal @ 2018-09-26 13:24 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd,
Arnd Bergmann <arnd@arndb.de> wrote on Wed, 26 Sep 2018 15:04:39 +0200:
> The platform_nand_data structure definition is required for ixdp425
> but has now moved to a new header file:
>
> arch/arm/mach-ixp4xx/ixdp425-setup.c:98:15: error: variable 'ixdp425_flash_nand_data' has initializer but incomplete type
> static struct platform_nand_data ixdp425_flash_nand_data = {
> ^~~~~~~~~~~~~~~~~~
> arch/arm/mach-ixp4xx/ixdp425-setup.c:99:3: error: 'struct platform_nand_data' has no member named 'chip'
>
> Fixes: 19cf5dfa3a31 ("mtd: rawnand: Move platform_nand_xxx definitions out of rawnand.h")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
Thanks,
Miqu?l
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 2/2] ARM: ixp4xx: include linux/mtd/platnand.h
2018-09-26 13:04 ` [PATCH 2/2] ARM: ixp4xx: include linux/mtd/platnand.h Arnd Bergmann
2018-09-26 13:24 ` Miquel Raynal
@ 2018-10-01 11:46 ` Krzysztof Hałasa
2018-10-05 14:37 ` Miquel Raynal
2 siblings, 0 replies; 6+ messages in thread
From: Krzysztof Hałasa @ 2018-10-01 11:46 UTC (permalink / raw)
To: linux-arm-kernel
Arnd Bergmann <arnd@arndb.de> writes:
> The platform_nand_data structure definition is required for ixdp425
> but has now moved to a new header file:
>
> arch/arm/mach-ixp4xx/ixdp425-setup.c:98:15: error: variable 'ixdp425_flash_nand_data' has initializer but incomplete type
> static struct platform_nand_data ixdp425_flash_nand_data = {
> ^~~~~~~~~~~~~~~~~~
> arch/arm/mach-ixp4xx/ixdp425-setup.c:99:3: error: 'struct platform_nand_data' has no member named 'chip'
>
> Fixes: 19cf5dfa3a31 ("mtd: rawnand: Move platform_nand_xxx definitions out of rawnand.h")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> arch/arm/mach-ixp4xx/ixdp425-setup.c | 1 +
Right.
Acked-by: Krzysztof Halasa <khalasa@piap.pl>
--
Krzysztof Halasa
Industrial Research Institute for Automation and Measurements PIAP
Al. Jerozolimskie 202, 02-486 Warsaw, Poland
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 2/2] ARM: ixp4xx: include linux/mtd/platnand.h
2018-09-26 13:04 ` [PATCH 2/2] ARM: ixp4xx: include linux/mtd/platnand.h Arnd Bergmann
2018-09-26 13:24 ` Miquel Raynal
2018-10-01 11:46 ` Krzysztof Hałasa
@ 2018-10-05 14:37 ` Miquel Raynal
2 siblings, 0 replies; 6+ messages in thread
From: Miquel Raynal @ 2018-10-05 14:37 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd,
Arnd Bergmann <arnd@arndb.de> wrote on Wed, 26 Sep 2018 15:04:39 +0200:
> The platform_nand_data structure definition is required for ixdp425
> but has now moved to a new header file:
>
> arch/arm/mach-ixp4xx/ixdp425-setup.c:98:15: error: variable 'ixdp425_flash_nand_data' has initializer but incomplete type
> static struct platform_nand_data ixdp425_flash_nand_data = {
> ^~~~~~~~~~~~~~~~~~
> arch/arm/mach-ixp4xx/ixdp425-setup.c:99:3: error: 'struct platform_nand_data' has no member named 'chip'
>
> Fixes: 19cf5dfa3a31 ("mtd: rawnand: Move platform_nand_xxx definitions out of rawnand.h")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
Sorry for the delay, squashed in nand/next with the commit introducing
the regression.
Thanks,
Miqu?l
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/2] ARM: omap1: add nand_chip declaration
2018-09-26 13:04 [PATCH 1/2] ARM: omap1: add nand_chip declaration Arnd Bergmann
2018-09-26 13:04 ` [PATCH 2/2] ARM: ixp4xx: include linux/mtd/platnand.h Arnd Bergmann
@ 2018-09-26 13:23 ` Miquel Raynal
1 sibling, 0 replies; 6+ messages in thread
From: Miquel Raynal @ 2018-09-26 13:23 UTC (permalink / raw)
To: linux-arm-kernel
Hi Arnd,
Thanks for the fix, sorry for breaking the build.
Arnd Bergmann <arnd@arndb.de> wrote on Wed, 26 Sep 2018 15:04:38 +0200:
> Recent MTD changes caused a minor build regression on OMAP1:
>
> In file included from arch/arm/mach-omap1/devices.c:31:
> arch/arm/mach-omap1/common.h:85:39: error: 'struct nand_chip' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
>
> Fixes: 1002aed789bc ("mtd: rawnand: plat_nand: Pass a nand_chip object to all platform_nand_ctrl hooks")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> arch/arm/mach-omap1/common.h | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/arch/arm/mach-omap1/common.h b/arch/arm/mach-omap1/common.h
> index 11b87a4c84d4..82f2c065040a 100644
> --- a/arch/arm/mach-omap1/common.h
> +++ b/arch/arm/mach-omap1/common.h
> @@ -82,6 +82,7 @@ void omap1_restart(enum reboot_mode, const char *);
>
> extern void __init omap_check_revision(void);
>
> +struct nand_chip;
> extern void omap1_nand_cmd_ctl(struct nand_chip *this, int cmd,
> unsigned int ctrl);
>
Currently I see "#include <linux/mtd/mtd.h>" at the top of this file.
That's where the "struct mtd_info" that has been replaced by a "struct
nand_chip" was declared. The nand_chip object is declared in
<linux/mtd/rawnand.h>.
I think you can remove this include (unneeded anymore for what I see).
Then, either you keep the nand_chip forward declaration, or replace the
mtd.h include into the rawnand.h one?
Thanks,
Miqu?l
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2018-10-05 14:37 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-09-26 13:04 [PATCH 1/2] ARM: omap1: add nand_chip declaration Arnd Bergmann
2018-09-26 13:04 ` [PATCH 2/2] ARM: ixp4xx: include linux/mtd/platnand.h Arnd Bergmann
2018-09-26 13:24 ` Miquel Raynal
2018-10-01 11:46 ` Krzysztof Hałasa
2018-10-05 14:37 ` Miquel Raynal
2018-09-26 13:23 ` [PATCH 1/2] ARM: omap1: add nand_chip declaration Miquel Raynal
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).