diff options
author | Arend van Spriel <arend@broadcom.com> | 2011-05-10 22:25:32 +0200 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-05-11 13:58:22 -0700 |
commit | 3422731627c334c2230f5e407ec88e4a4aff0844 (patch) | |
tree | 5a2aa967e2f28718e984e69813e8ee992d7abc98 /drivers/staging/brcm80211/util/bcmutils.c | |
parent | de91ed29c4ba7bfc6789bf018a2f4605f1ece2a8 (diff) | |
download | linux-3422731627c334c2230f5e407ec88e4a4aff0844.tar.gz |
staging: brcm80211: use print_hex_dump_bytes kernel function
The drivers had own implementation to dump buffer contents using
printk. This has been replaced by kernel function.
Cc: devel@linuxdriverproject.org
Reviewed-by: Henry Ptasinski <henryp@broadcom.com>
Reviewed-by: Roland Vossen <rvossen@broadcom.com>
Reviewed-by: Brett Rudley <brudley@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/staging/brcm80211/util/bcmutils.c')
-rw-r--r-- | drivers/staging/brcm80211/util/bcmutils.c | 40 |
1 files changed, 2 insertions, 38 deletions
diff --git a/drivers/staging/brcm80211/util/bcmutils.c b/drivers/staging/brcm80211/util/bcmutils.c index cca5b7d92d33..e185e286a6ca 100644 --- a/drivers/staging/brcm80211/util/bcmutils.c +++ b/drivers/staging/brcm80211/util/bcmutils.c @@ -21,6 +21,7 @@ #include <linux/pci.h> #include <linux/netdevice.h> #include <linux/sched.h> +#include <linux/printk.h> #include <bcmdefs.h> #include <stdarg.h> #include <bcmutils.h> @@ -386,7 +387,7 @@ void bcm_prpkt(const char *msg, struct sk_buff *p0) printk(KERN_DEBUG "%s:\n", msg); for (p = p0; p; p = p->next) - bcm_prhex(NULL, p->data, p->len); + print_hex_dump_bytes("", DUMP_PREFIX_OFFSET, p->data, p->len); } EXPORT_SYMBOL(bcm_prpkt); #endif /* defined(BCMDBG) */ @@ -629,43 +630,6 @@ int bcm_format_hex(char *str, const void *bytes, int len) EXPORT_SYMBOL(bcm_format_hex); #endif /* defined(BCMDBG) */ -/* pretty hex print a contiguous buffer */ -void bcm_prhex(const char *msg, unsigned char *buf, uint nbytes) -{ - char line[128], *p; - int len = sizeof(line); - int nchar; - uint i; - - if (msg && (msg[0] != '\0')) - printk(KERN_DEBUG "%s:\n", msg); - - p = line; - for (i = 0; i < nbytes; i++) { - if (i % 16 == 0) { - nchar = snprintf(p, len, " %04d: ", i); /* line prefix */ - p += nchar; - len -= nchar; - } - if (len > 0) { - nchar = snprintf(p, len, "%02x ", buf[i]); - p += nchar; - len -= nchar; - } - - if (i % 16 == 15) { - printk(KERN_DEBUG "%s\n", line); /* flush line */ - p = line; - len = sizeof(line); - } - } - - /* flush last partial line */ - if (p != line) - printk(KERN_DEBUG "%s\n", line); -} -EXPORT_SYMBOL(bcm_prhex); - char *bcm_chipname(uint chipid, char *buf, uint len) { const char *fmt; |