From 37a456cdad95c676bb1608c28eb56d10da824f88 Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Mon, 25 Apr 2011 16:46:49 -0700
Subject: [PATCH] --- yaml --- r: 248675 b: refs/heads/master c:
 0a77c4f9d451a6652f5536548df1b75f4b5b836c h: refs/heads/master i:   248673:
 98c620a6720f6139b05c2f080e918d34e86ae064   248671:
 bf75804837ce64a3367e2d50f656630b079e435e v: v3

---
 [refs]                    |  2 +-
 trunk/drivers/tty/n_gsm.c | 35 ++++++++++-------------------------
 2 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/[refs] b/[refs]
index 9add93eec3a6..ef0e514e889c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df43daaae926c3710eda911ec048808c904572fe
+refs/heads/master: 0a77c4f9d451a6652f5536548df1b75f4b5b836c
diff --git a/trunk/drivers/tty/n_gsm.c b/trunk/drivers/tty/n_gsm.c
index 6abc73598847..720160acd9dc 100644
--- a/trunk/drivers/tty/n_gsm.c
+++ b/trunk/drivers/tty/n_gsm.c
@@ -526,19 +526,6 @@ static int gsm_stuff_frame(const u8 *input, u8 *output, int len)
 	return olen;
 }
 
-static void hex_packet(const unsigned char *p, int len)
-{
-	int i;
-	for (i = 0; i < len; i++) {
-		if (i && (i % 16) == 0) {
-			pr_cont("\n");
-			pr_debug("");
-		}
-		pr_cont("%02X ", *p++);
-	}
-	pr_cont("\n");
-}
-
 /**
  *	gsm_send	-	send a control frame
  *	@gsm: our GSM mux
@@ -685,10 +672,10 @@ static void gsm_data_kick(struct gsm_mux *gsm)
 			len = msg->len + 2;
 		}
 
-		if (debug & 4) {
-			pr_debug("gsm_data_kick:\n");
-			hex_packet(gsm->txframe, len);
-		}
+		if (debug & 4)
+			print_hex_dump_bytes("gsm_data_kick: ",
+					     DUMP_PREFIX_OFFSET,
+					     gsm->txframe, len);
 
 		if (gsm->output(gsm, gsm->txframe + skip_sof,
 						len - skip_sof) < 0)
@@ -2091,10 +2078,9 @@ static int gsmld_output(struct gsm_mux *gsm, u8 *data, int len)
 		set_bit(TTY_DO_WRITE_WAKEUP, &gsm->tty->flags);
 		return -ENOSPC;
 	}
-	if (debug & 4) {
-		pr_debug("-->%d bytes out\n", len);
-		hex_packet(data, len);
-	}
+	if (debug & 4)
+		print_hex_dump_bytes("gsmld_output: ", DUMP_PREFIX_OFFSET,
+				     data, len);
 	gsm->tty->ops->write(gsm->tty, data, len);
 	return len;
 }
@@ -2148,10 +2134,9 @@ static unsigned int gsmld_receive_buf(struct tty_struct *tty,
 	char buf[64];
 	char flags;
 
-	if (debug & 4) {
-		pr_debug("Inbytes %dd\n", count);
-		hex_packet(cp, count);
-	}
+	if (debug & 4)
+		print_hex_dump_bytes("gsmld_receive: ", DUMP_PREFIX_OFFSET,
+				     cp, count);
 
 	for (i = count, dp = cp, f = fp; i; i--, dp++) {
 		flags = *f++;