Commit 4ca8c452 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by John W. Linville

wireless: at76c50x: use native hex_pack_byte() method

Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: "John W. Linville" <linville@tuxdriver.com>
Tested-by: default avatarPavel Roskin <proski@gnu.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 08740735
...@@ -500,10 +500,9 @@ static int at76_usbdfu_download(struct usb_device *udev, u8 *buf, u32 size, ...@@ -500,10 +500,9 @@ static int at76_usbdfu_download(struct usb_device *udev, u8 *buf, u32 size,
#define HEX2STR_BUFFERS 4 #define HEX2STR_BUFFERS 4
#define HEX2STR_MAX_LEN 64 #define HEX2STR_MAX_LEN 64
#define BIN2HEX(x) ((x) < 10 ? '0' + (x) : (x) + 'A' - 10)
/* Convert binary data into hex string */ /* Convert binary data into hex string */
static char *hex2str(void *buf, int len) static char *hex2str(void *buf, size_t len)
{ {
static atomic_t a = ATOMIC_INIT(0); static atomic_t a = ATOMIC_INIT(0);
static char bufs[HEX2STR_BUFFERS][3 * HEX2STR_MAX_LEN + 1]; static char bufs[HEX2STR_BUFFERS][3 * HEX2STR_MAX_LEN + 1];
...@@ -514,18 +513,17 @@ static char *hex2str(void *buf, int len) ...@@ -514,18 +513,17 @@ static char *hex2str(void *buf, int len)
if (len > HEX2STR_MAX_LEN) if (len > HEX2STR_MAX_LEN)
len = HEX2STR_MAX_LEN; len = HEX2STR_MAX_LEN;
if (len <= 0) { if (len == 0)
ret[0] = '\0'; goto exit;
return ret;
}
while (len--) { while (len--) {
*obuf++ = BIN2HEX(*ibuf >> 4); obuf = pack_hex_byte(obuf, *ibuf++);
*obuf++ = BIN2HEX(*ibuf & 0xf);
*obuf++ = '-'; *obuf++ = '-';
ibuf++;
} }
*(--obuf) = '\0'; obuf--;
exit:
*obuf = '\0';
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment