From: Mike Frysinger <vapier@gentoo.org>
Date: Wed, 22 Dec 2010 14:41:13 +0000 (-0500)
Subject: cfi_flash: avoid flash_verbose when possible
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4ffeab2cc00b61bc4616d9e3c25d33937b0feb34;p=project%2Fbcm63xx%2Fu-boot.git

cfi_flash: avoid flash_verbose when possible

The flash_verbose logic is only used by the CFI MTD layer, so if we aren't
using that, disable the logic completely.

Signed-off-by: Mike Frysinger <vapier@gentoo.org>
---

diff --git a/drivers/mtd/cfi_flash.c b/drivers/mtd/cfi_flash.c
index b0068842f1..1e8d3757f4 100644
--- a/drivers/mtd/cfi_flash.c
+++ b/drivers/mtd/cfi_flash.c
@@ -63,7 +63,11 @@
  */
 
 static uint flash_offset_cfi[2] = { FLASH_OFFSET_CFI, FLASH_OFFSET_CFI_ALT };
+#ifdef CONFIG_FLASH_CFI_MTD
 static uint flash_verbose = 1;
+#else
+#define flash_verbose 1
+#endif
 
 flash_info_t flash_info[CFI_MAX_FLASH_BANKS];	/* FLASH chips info */
 
@@ -2042,10 +2046,12 @@ ulong flash_get_size (phys_addr_t base, int banknum)
 	return (info->size);
 }
 
+#ifdef CONFIG_FLASH_CFI_MTD
 void flash_set_verbose(uint v)
 {
 	flash_verbose = v;
 }
+#endif
 
 static void cfi_flash_set_config_reg(u32 base, u16 val)
 {