UBI: use linux print_hex_dump(), not home-grown one

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
index 310341e5cd43065b8e5e3df1a7afefd56a161a67..78513743518500bf4e1bd2ccbb2980b567b820ff 100644 (file)
--- a/drivers/mtd/ubi/debug.c
+++ b/drivers/mtd/ubi/debug.c
@@ -42,7 +42,8 @@ void ubi_dbg_dump_ec_hdr(const struct ubi_ec_hdr *ec_hdr)
        dbg_msg("data_offset    %d",    be32_to_cpu(ec_hdr->data_offset));
        dbg_msg("hdr_crc        %#08x", be32_to_cpu(ec_hdr->hdr_crc));
        dbg_msg("erase counter header hexdump:");
-       ubi_dbg_hexdump(ec_hdr, UBI_EC_HDR_SIZE);
+       print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 4,
+                      (void *)ec_hdr, UBI_EC_HDR_SIZE, 1);
 }
 
 /**
@@ -187,38 +188,4 @@ void ubi_dbg_dump_mkvol_req(const struct ubi_mkvol_req *req)
        dbg_msg("the 1st 16 characters of the name: %s", nm);
 }
 
-#define BYTES_PER_LINE 32
-
-/**
- * ubi_dbg_hexdump - dump a buffer.
- * @ptr: the buffer to dump
- * @size: buffer size which must be multiple of 4 bytes
- */
-void ubi_dbg_hexdump(const void *ptr, int size)
-{
-       int i, k = 0, rows, columns;
-       const uint8_t *p = ptr;
-
-       size = ALIGN(size, 4);
-       rows = size/BYTES_PER_LINE + size % BYTES_PER_LINE;
-       for (i = 0; i < rows; i++) {
-               int j;
-
-               cond_resched();
-               columns = min(size - k, BYTES_PER_LINE) / 4;
-               if (columns == 0)
-                       break;
-               printk(KERN_DEBUG "%5d:  ", i * BYTES_PER_LINE);
-               for (j = 0; j < columns; j++) {
-                       int n, N;
-
-                       N = size - k > 4 ? 4 : size - k;
-                       for (n = 0; n < N; n++)
-                               printk("%02x", p[k++]);
-                       printk(" ");
-               }
-               printk("\n");
-       }
-}
-
 #endif /* CONFIG_MTD_UBI_DEBUG_MSG */

diff --git a/drivers/mtd/ubi/debug.h b/drivers/mtd/ubi/debug.h
index ff8f39548cd80aaf58cb979d291e609f4d80f214..467722eb618b20a384320e4bee15be409f2f5e77 100644 (file)
--- a/drivers/mtd/ubi/debug.h
+++ b/drivers/mtd/ubi/debug.h
@@ -59,7 +59,6 @@ void ubi_dbg_dump_vtbl_record(const struct ubi_vtbl_record *r, int idx);
 void ubi_dbg_dump_sv(const struct ubi_scan_volume *sv);
 void ubi_dbg_dump_seb(const struct ubi_scan_leb *seb, int type);
 void ubi_dbg_dump_mkvol_req(const struct ubi_mkvol_req *req);
-void ubi_dbg_hexdump(const void *buf, int size);
 
 #else
 
@@ -72,7 +71,6 @@ void ubi_dbg_hexdump(const void *buf, int size);
 #define ubi_dbg_dump_sv(sv)              ({})
 #define ubi_dbg_dump_seb(seb, type)      ({})
 #define ubi_dbg_dump_mkvol_req(req)      ({})
-#define ubi_dbg_hexdump(buf, size)       ({})
 
 #endif /* CONFIG_MTD_UBI_DEBUG_MSG */
 

diff --git a/drivers/mtd/ubi/io.c b/drivers/mtd/ubi/io.c
index d42ec687b01419192dc443cdb099e6f2c52c1a4e..928476394d559eeb446f24e1fdaa6e5bb5f82086 100644 (file)
--- a/drivers/mtd/ubi/io.c
+++ b/drivers/mtd/ubi/io.c
@@ -1252,7 +1252,7 @@ static int paranoid_check_all_ff(const struct ubi_device *ubi, int pnum,
 fail:
        ubi_err("paranoid check failed for PEB %d", pnum);
        dbg_msg("hex dump of the %d-%d region", offset, offset + len);
-       ubi_dbg_hexdump(buf, len);
+       print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 4, buf, len, 1);
        err = 1;
 error:
        ubi_dbg_dump_stack();