From f97eab34dbfe5a0b0f18d71db4205100c2adb27d Mon Sep 17 00:00:00 2001
From: Yun Park <yunp@qca.qualcomm.com>
Date: Mon, 9 Nov 2015 13:34:07 -0800
Subject: [PATCH] qcacld-3.0: Change cdf_trace_hex_dump to use
 hex_dump_to_buffer

qcacld-2.0 to qcacld-3.0 propagation

Change cdf_trace_hex_dump to use hex_dump_to_buffer.
This will print one line even if buffer size is less than 16 bytes.

Change-Id: I2dec78048d52f96d494c9e0ce133c4c18f48e954
CRs-fixed: 933157
---
 core/cdf/src/cdf_trace.c | 40 ++++++++++++++++------------------------
 1 file changed, 16 insertions(+), 24 deletions(-)

diff --git a/core/cdf/src/cdf_trace.c b/core/cdf/src/cdf_trace.c
index 3d59c53d272f..dfacdd45cb20 100644
--- a/core/cdf/src/cdf_trace.c
+++ b/core/cdf/src/cdf_trace.c
@@ -355,6 +355,10 @@ void cdf_trace_display(void)
 	}
 }
 
+#define ROW_SIZE 16
+/* Buffer size = data bytes(2 hex chars plus space) + NULL */
+#define BUFFER_SIZE ((ROW_SIZE * 3) + 1)
+
 /**
  * cdf_trace_hex_dump() - externally called hex dump function
  * @module : Module identifier a member of the CDF_MODULE_ID enumeration that
@@ -372,35 +376,23 @@ void cdf_trace_display(void)
 void cdf_trace_hex_dump(CDF_MODULE_ID module, CDF_TRACE_LEVEL level,
 			void *data, int buf_len)
 {
-	char *buf = (char *)data;
-	int i;
+	const u8 *ptr = data;
+	int i, linelen, remaining = buf_len;
+	unsigned char linebuf[BUFFER_SIZE];
 
 	if (!(g_cdf_trace_info[module].moduleTraceLevel &
-	      CDF_TRACE_LEVEL_TO_MODULE_BITMASK(level)))
+		CDF_TRACE_LEVEL_TO_MODULE_BITMASK(level)))
 		return;
 
-	for (i = 0; (i + 15) < buf_len; i += 16) {
-		cdf_trace_msg(module, level,
-			      "%02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x",
-			      buf[i],
-			      buf[i + 1],
-			      buf[i + 2],
-			      buf[i + 3],
-			      buf[i + 4],
-			      buf[i + 5],
-			      buf[i + 6],
-			      buf[i + 7],
-			      buf[i + 8],
-			      buf[i + 9],
-			      buf[i + 10],
-			      buf[i + 11],
-			      buf[i + 12],
-			      buf[i + 13], buf[i + 14], buf[i + 15]);
-	}
+	for (i = 0; i < buf_len; i += ROW_SIZE) {
+		linelen = min(remaining, ROW_SIZE);
+		remaining -= ROW_SIZE;
 
-	/* Dump the bytes in the last line */
-	for (; i < buf_len; i++)
-		cdf_trace_msg(module, level, "%02x ", buf[i]);
+		hex_dump_to_buffer(ptr + i, linelen, ROW_SIZE, 1,
+				linebuf, sizeof(linebuf), false);
+
+		cdf_trace_msg(module, level, "%.8x: %s", i, linebuf);
+	}
 }
 
 #endif