aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/wireless/at76c50x-usb.c
diff options
context:
space:
mode:
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>2011-09-28 05:30:59 -0400
committerJohn W. Linville <linville@tuxdriver.com>2011-09-30 15:16:25 -0400
commit4ca8c452a655d96639975d132f586f2829f6564e (patch)
treedd248beeac8cad69b7c5343c2525b8c79730b584 /drivers/net/wireless/at76c50x-usb.c
parent0874073570d9184a169a4ae2abbe8dbcb71878e9 (diff)
wireless: at76c50x: use native hex_pack_byte() method
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Cc: "John W. Linville" <linville@tuxdriver.com> Tested-by: Pavel Roskin <proski@gnu.org> Signed-off-by: John W. Linville <linville@tuxdriver.com>
Diffstat (limited to 'drivers/net/wireless/at76c50x-usb.c')
-rw-r--r--drivers/net/wireless/at76c50x-usb.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/drivers/net/wireless/at76c50x-usb.c b/drivers/net/wireless/at76c50x-usb.c
index 298601436ee2..39322d4121b7 100644
--- a/drivers/net/wireless/at76c50x-usb.c
+++ b/drivers/net/wireless/at76c50x-usb.c
@@ -500,10 +500,9 @@ exit:
500 500
501#define HEX2STR_BUFFERS 4 501#define HEX2STR_BUFFERS 4
502#define HEX2STR_MAX_LEN 64 502#define HEX2STR_MAX_LEN 64
503#define BIN2HEX(x) ((x) < 10 ? '0' + (x) : (x) + 'A' - 10)
504 503
505/* Convert binary data into hex string */ 504/* Convert binary data into hex string */
506static char *hex2str(void *buf, int len) 505static char *hex2str(void *buf, size_t len)
507{ 506{
508 static atomic_t a = ATOMIC_INIT(0); 507 static atomic_t a = ATOMIC_INIT(0);
509 static char bufs[HEX2STR_BUFFERS][3 * HEX2STR_MAX_LEN + 1]; 508 static char bufs[HEX2STR_BUFFERS][3 * HEX2STR_MAX_LEN + 1];
@@ -514,18 +513,17 @@ static char *hex2str(void *buf, int len)
514 if (len > HEX2STR_MAX_LEN) 513 if (len > HEX2STR_MAX_LEN)
515 len = HEX2STR_MAX_LEN; 514 len = HEX2STR_MAX_LEN;
516 515
517 if (len <= 0) { 516 if (len == 0)
518 ret[0] = '\0'; 517 goto exit;
519 return ret;
520 }
521 518
522 while (len--) { 519 while (len--) {
523 *obuf++ = BIN2HEX(*ibuf >> 4); 520 obuf = pack_hex_byte(obuf, *ibuf++);
524 *obuf++ = BIN2HEX(*ibuf & 0xf);
525 *obuf++ = '-'; 521 *obuf++ = '-';
526 ibuf++;
527 } 522 }
528 *(--obuf) = '\0'; 523 obuf--;
524
525exit:
526 *obuf = '\0';
529 527
530 return ret; 528 return ret;
531} 529}