Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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

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

+3 -38
+2 -35
drivers/mtd/ubi/debug.c
··· 42 42 dbg_msg("data_offset %d", be32_to_cpu(ec_hdr->data_offset)); 43 43 dbg_msg("hdr_crc %#08x", be32_to_cpu(ec_hdr->hdr_crc)); 44 44 dbg_msg("erase counter header hexdump:"); 45 - ubi_dbg_hexdump(ec_hdr, UBI_EC_HDR_SIZE); 45 + print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 4, 46 + (void *)ec_hdr, UBI_EC_HDR_SIZE, 1); 46 47 } 47 48 48 49 /** ··· 186 185 memcpy(nm, req->name, 16); 187 186 nm[16] = 0; 188 187 dbg_msg("the 1st 16 characters of the name: %s", nm); 189 - } 190 - 191 - #define BYTES_PER_LINE 32 192 - 193 - /** 194 - * ubi_dbg_hexdump - dump a buffer. 195 - * @ptr: the buffer to dump 196 - * @size: buffer size which must be multiple of 4 bytes 197 - */ 198 - void ubi_dbg_hexdump(const void *ptr, int size) 199 - { 200 - int i, k = 0, rows, columns; 201 - const uint8_t *p = ptr; 202 - 203 - size = ALIGN(size, 4); 204 - rows = size/BYTES_PER_LINE + size % BYTES_PER_LINE; 205 - for (i = 0; i < rows; i++) { 206 - int j; 207 - 208 - cond_resched(); 209 - columns = min(size - k, BYTES_PER_LINE) / 4; 210 - if (columns == 0) 211 - break; 212 - printk(KERN_DEBUG "%5d: ", i * BYTES_PER_LINE); 213 - for (j = 0; j < columns; j++) { 214 - int n, N; 215 - 216 - N = size - k > 4 ? 4 : size - k; 217 - for (n = 0; n < N; n++) 218 - printk("%02x", p[k++]); 219 - printk(" "); 220 - } 221 - printk("\n"); 222 - } 223 188 } 224 189 225 190 #endif /* CONFIG_MTD_UBI_DEBUG_MSG */
-2
drivers/mtd/ubi/debug.h
··· 59 59 void ubi_dbg_dump_sv(const struct ubi_scan_volume *sv); 60 60 void ubi_dbg_dump_seb(const struct ubi_scan_leb *seb, int type); 61 61 void ubi_dbg_dump_mkvol_req(const struct ubi_mkvol_req *req); 62 - void ubi_dbg_hexdump(const void *buf, int size); 63 62 64 63 #else 65 64 ··· 71 72 #define ubi_dbg_dump_sv(sv) ({}) 72 73 #define ubi_dbg_dump_seb(seb, type) ({}) 73 74 #define ubi_dbg_dump_mkvol_req(req) ({}) 74 - #define ubi_dbg_hexdump(buf, size) ({}) 75 75 76 76 #endif /* CONFIG_MTD_UBI_DEBUG_MSG */ 77 77
+1 -1
drivers/mtd/ubi/io.c
··· 1252 1252 fail: 1253 1253 ubi_err("paranoid check failed for PEB %d", pnum); 1254 1254 dbg_msg("hex dump of the %d-%d region", offset, offset + len); 1255 - ubi_dbg_hexdump(buf, len); 1255 + print_hex_dump(KERN_DEBUG, "", DUMP_PREFIX_OFFSET, 32, 4, buf, len, 1); 1256 1256 err = 1; 1257 1257 error: 1258 1258 ubi_dbg_dump_stack();