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

Commit Message

Arnd Bergmann Nov. 24, 2015, 10:09 p.m. UTC

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 <[e-mail]>
---
> I'm actually still getting the warnings for any file that includes <linux/mtd/map.h>
> while CONFIG_MTD is disabled. I have a fix now that I'm testing overnight
> and plan to post tomorrow, then we can decide whether it should be part of
> the same patch, or we should have two separate patches.

The patch fixes the remaining warnings I see on ARM randconfigs in this file,
and I think it makes sense to keep it as a separate patch, as these are really
distinct problems even thought the symptom is the same.

Please apply both.

Comments

Brian Norris Nov. 30, 2015, 8:55 p.m. UTC | #1

On Tue, Nov 24, 2015 at 11:09:02PM +0100, Arnd Bergmann wrote:
> 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 <[e-mail]>
> ---
> > I'm actually still getting the warnings for any file that includes <linux/mtd/map.h>
> > while CONFIG_MTD is disabled. I have a fix now that I'm testing overnight
> > and plan to post tomorrow, then we can decide whether it should be part of
> > the same patch, or we should have two separate patches.
> 
> The patch fixes the remaining warnings I see on ARM randconfigs in this file,
> and I think it makes sense to keep it as a separate patch, as these are really
> distinct problems even thought the symptom is the same.
> 
> Please apply both.
> 
> diff --git a/include/linux/mtd/map.h b/include/linux/mtd/map.h
> index 366cf77953b5..58f3ba709ade 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();
> 

I guess no one includes mtd/cfi.h with CONFIG_MTD=n? Otherwise, we might
have the same problems there.

Pushed to l2-mtd.git, thanks!

Brian

Arnd Bergmann Nov. 30, 2015, 9:41 p.m. UTC | #2

On Monday 30 November 2015 12:55:05 Brian Norris wrote:
> 
> I guess no one includes mtd/cfi.h with CONFIG_MTD=n? Otherwise, we might
> have the same problems there.

Right, I checked that all users of that file depend on CONFIG_MTD.

> Pushed to l2-mtd.git, thanks!

Thanks,

	ARnd

Patch

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