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

[Linux-MTD Mailing List]

Gitweb:     http://git.infradead.org/?p=mtd-2.6.git;a=commit;h=fe7579d6122f2869d00b55842bca9e2a9be51607
Commit:     fe7579d6122f2869d00b55842bca9e2a9be51607
Parent:     f5f92b36fbbb8ac7d70ff5fa39ec2637cce3094c
Author:     Arnd Bergmann <arnd at arndb.de>
AuthorDate: Tue Nov 24 23:09:02 2015 +0100
Committer:  Brian Norris <computersforpeace at gmail.com>
CommitDate: Mon Nov 30 12:36:44 2015 -0800

    mtd: cfi: don't warn about broken geometry for !CONFIG_MTD
    
    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 <arnd at arndb.de>
    Signed-off-by: Brian Norris <computersforpeace at gmail.com>
---
 include/linux/mtd/map.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h
index 366cf77..58f3ba7 100644
--- 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();