mtd: cfi: don't warn about broken geometry for !CONFIG_MTD

arndb · computersforpeace · commit fe7579d6122f · 2015-11-30T12:36:44.000-08:00
The linux/mtd/map.h header file is included by a couple of
platform specific files that are built even when CONFIG_MTD
is disabled, and we always get

 warning "No CONFIG_MTD_MAP_BANK_WIDTH_xx selected. No NOR chip support can work"

in that case. This adds an #ifdef around the pointless warning,
as everything is really fine when we don't build the drivers
anyway.

Signed-off-by: Arnd Bergmann &lt;arnd@arndb.de&gt;
Signed-off-by: Brian Norris &lt;computersforpeace@gmail.com&gt;
diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h
@@ -142,7 +142,9 @@
 #endif
 
 #ifndef map_bankwidth
+#ifdef CONFIG_MTD
 #warning "No CONFIG_MTD_MAP_BANK_WIDTH_xx selected. No NOR chip support can work"
+#endif
 static inline int map_bankwidth(void *map)
 {
 	BUG();

Original file line number	Diff line number	Diff line change
`@@ -142,7 +142,9 @@`
`142`	`142`	`#endif`
`143`	`143`
`144`	`144`	`#ifndef map_bankwidth`
	`145`	`+#ifdef CONFIG_MTD`
`145`	`146`	`#warning "No CONFIG_MTD_MAP_BANK_WIDTH_xx selected. No NOR chip support can work"`
	`147`	`+#endif`
`146`	`148`	`static inline int map_bankwidth(void *map)`
`147`	`149`	`{`
`148`	`150`	`BUG();`