Skip to contentSkip to conversation

ARM: omap1: add nand_chip declaration

PATCH In review Arnd Bergmann 3 participants 5 messages Sep 26, 2018 – Oct 5, 2018

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 ARM: omap1: add nand_chip declaration

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")

----
v2: remove unused linux/mtd/mtd.h inclusion

---
 arch/arm/mach-omap1/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap1/common.h +1 -1
index 11b87a4c84d4..504b959ba5cf 100644
@@ -26,7 +26,6 @@
 #ifndef __ARCH_ARM_MACH_OMAP1_COMMON_H
 #define __ARCH_ARM_MACH_OMAP1_COMMON_H
 
-#include <linux/mtd/mtd.h>
 #include <linux/platform_data/i2c-omap.h>
 #include <linux/reboot.h>
 
@@ -82,6 +81,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);
 
Signature · 1 line
2.18.0
maintainer
#1 lore raw

Hi Arnd,

Arnd Bergmann <[email protected]> wrote on Wed, 26 Sep 2018 16:20:16 +0200:

Quoted 26 lines

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")

----
v2: remove unused linux/mtd/mtd.h inclusion

---
 arch/arm/mach-omap1/common.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/mach-omap1/common.h +0 -1
index 11b87a4c84d4..504b959ba5cf 100644
@@ -26,7 +26,6 @@
 #ifndef __ARCH_ARM_MACH_OMAP1_COMMON_H
 #define __ARCH_ARM_MACH_OMAP1_COMMON_H
 
-#include <linux/mtd/mtd.h>
 #include <linux/platform_data/i2c-omap.h>
 #include <linux/reboot.h>
 

arch/arm/mach-omap1/common.h void omap1_restart(enum reboot_mode, const char *); · line 87

Quoted 7 lines
arch/arm/mach-omap1/common.h +1 -0
@@ -82,6 +81,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);
 

Boris pointed me that the commit introducing the regression is still in nand/next, so do you mind if I squash both patches with it?

Regards,
Miqu?l

#2 lore raw
Quoted 5 lines · Miquel Raynal

Arnd Bergmann <[email protected]> wrote on Wed, 26 Sep 2018 16:20:16 +0200:

Quoted 4 lines
arch/arm/mach-omap1/common.h +0 -0
@@ -82,6 +81,7 @@ void omap1_restart(enum reboot_mode, const char *);
 
 extern void __init omap_check_revision(void);
 
Quoted 7 lines

arch/arm/mach-omap1/common.h void omap1_restart(enum reboot_mode, const char *); · line 87

Quoted 4 lines
arch/arm/mach-omap1/common.h +1 -0
+struct nand_chip;
 extern void omap1_nand_cmd_ctl(struct nand_chip *this, int cmd,
                             unsigned int ctrl);
 

Boris pointed me that the commit introducing the regression is still in nand/next, so do you mind if I squash both patches with it?

No worries, please do that if it makes it easier for you.

Arnd

reviewer Acked-by on v2 1/1
#3 lore raw
In reply to Arnd Bergmann
Quoted 9 lines · Arnd Bergmann

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")

----
v2: remove unused linux/mtd/mtd.h inclusion

maintainer
#4 lore raw
In reply to Arnd Bergmann

Hi Arnd,

Arnd Bergmann <[email protected]> wrote on Wed, 26 Sep 2018 16:20:16 +0200:

Quoted 10 lines

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")

----
v2: remove unused linux/mtd/mtd.h inclusion
---

Also squashed in nand/next with the failing commit.

Thanks,
Miqu?l