ubi: fix UBI_SILENCE_MSG

 - drop CONFIG_ prefix from kconfig entry
 - fix small compilation issue with CONFIG_UBI_SILENCE_MSG

Signed-off-by: Markus Klotzbuecher <markus.klotzbuecher@kistler.com>
Reviewed-by: Heiko Schocher <hs@denx.de>
Cc: Kyungmin Park <kmpark@infradead.org>

diff --git a/drivers/mtd/ubi/Kconfig b/drivers/mtd/ubi/Kconfig
index 2b17eae94701d41cbfaf88aca28655e380b7e1f5..a78fd51ba7dcf21c14e6b00cb56b5a131766ba94 100644 (file)
--- a/drivers/mtd/ubi/Kconfig
+++ b/drivers/mtd/ubi/Kconfig
@@ -1,6 +1,6 @@
 menu "UBI support"
 
-config CONFIG_UBI_SILENCE_MSG
+config UBI_SILENCE_MSG
        bool "UBI silence verbose messages"
        default ENV_IS_IN_UBI
        help

diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
index 8ef7823b37cd020422675d3d8435dc6622b9f9ee..688fb509d2c2dc4f5b0bd3cc5b32988cc64baa11 100644 (file)
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
@@ -1351,6 +1351,7 @@ static int self_check_write(struct ubi_device *ubi, const void *buf, int pnum,
 
                ubi_err(ubi, "self-check failed for PEB %d:%d, len %d",
                        pnum, offset, len);
+#if !defined(CONFIG_UBI_SILENCE_MSG)
                ubi_msg(ubi, "data differ at position %d", i);
                ubi_msg(ubi, "hex dump of the original buffer from %d to %d",
                        i, i + dump_len);
@@ -1360,6 +1361,7 @@ static int self_check_write(struct ubi_device *ubi, const void *buf, int pnum,
                        i, i + dump_len);
                print_hex_dump("", DUMP_PREFIX_OFFSET, 32, 1,
                               buf1 + i, dump_len, 1);
+#endif
                dump_stack();
                err = -EINVAL;
                goto out_free;