Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6] / drivers / mtd / ubi / debug.c

diff --git a/drivers/mtd/ubi/debug.c b/drivers/mtd/ubi/debug.c
index 9a996c5280f9c7a08808ba77ff67d5a603628b0a..56956ec2845ff70bf4139f08ba56184487005816 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, 1,
+                      ec_hdr, UBI_EC_HDR_SIZE, 1);
 }
 
 /**
@@ -91,7 +92,7 @@ void ubi_dbg_dump_vol_info(const struct ubi_volume *vol)
 
        if (vol->name_len <= UBI_VOL_NAME_MAX &&
            strnlen(vol->name, vol->name_len + 1) == vol->name_len) {
-               dbg_msg("name          %s", vol->name);
+               dbg_msg("name            %s", vol->name);
        } else {
                dbg_msg("the 1st 5 characters of the name: %c%c%c%c%c",
                        vol->name[0], vol->name[1], vol->name[2],
@@ -117,13 +118,13 @@ void ubi_dbg_dump_vtbl_record(const struct ubi_vtbl_record *r, int idx)
        dbg_msg("name_len        %d", name_len);
 
        if (r->name[0] == '\0') {
-               dbg_msg("name          NULL");
+               dbg_msg("name            NULL");
                return;
        }
 
        if (name_len <= UBI_VOL_NAME_MAX &&
            strnlen(&r->name[0], name_len + 1) == name_len) {
-               dbg_msg("name          %s", &r->name[0]);
+               dbg_msg("name            %s", &r->name[0]);
        } else {
                dbg_msg("1st 5 characters of the name: %c%c%c%c%c",
                        r->name[0], r->name[1], r->name[2], r->name[3],
@@ -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 */