hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bnx2x: Replace custom scnprintf() 

Use scnprintf() when printing version instead of custom open coded variants.

Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Acked-by: Yuval Mintz <Yuval.Mintz@cavium.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Andy Shevchenko 2017-04-27 16:36:59 +03:00 committed by David S. Miller
parent 4750c7be5b
commit 55b218c12c
1 changed files with 9 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
View File

@ -6163,94 +6163,33 @@ static void bnx2x_link_int_ack(struct link_params *params,
static int bnx2x_format_ver(u32 num, u8 *str, u16 *len) static int bnx2x_format_ver(u32 num, u8 *str, u16 *len)
{ {
u8 *str_ptr = str; u16 ret;
u32 mask = 0xf0000000;
u8 shift = 8*4;
u8 digit;
u8 remove_leading_zeros = 1;
if (*len < 10) { if (*len < 10) {
/* Need more than 10chars for this format */ /* Need more than 10chars for this format */
*str_ptr = '\0'; *str = '\0';
(*len)--; (*len)--;
return -EINVAL; return -EINVAL;
} }
while (shift > 0) {
shift -= 4; ret = scnprintf(str, *len, "%hx.%hx", num >> 16, num);
digit = ((num & mask) >> shift); *len -= ret;
if (digit == 0 && remove_leading_zeros) {
*str_ptr = '0';
} else {
if (digit < 0xa)
*str_ptr = digit + '0';
else
*str_ptr = digit - 0xa + 'a';
remove_leading_zeros = 0;
str_ptr++;
(*len)--;
}
mask = mask >> 4;
if (shift == 4*4) {
if (remove_leading_zeros) {
str_ptr++;
(*len)--;
}
*str_ptr = '.';
str_ptr++;
(*len)--;
remove_leading_zeros = 1;
}
}
if (remove_leading_zeros)
(*len)--;
return 0; return 0;
} }
static int bnx2x_3_seq_format_ver(u32 num, u8 *str, u16 *len) static int bnx2x_3_seq_format_ver(u32 num, u8 *str, u16 *len)
{ {
u8 *str_ptr = str; u16 ret;
u32 mask = 0x00f00000;
u8 shift = 8*3;
u8 digit;
u8 remove_leading_zeros = 1;
if (*len < 10) { if (*len < 10) {
/* Need more than 10chars for this format */ /* Need more than 10chars for this format */
*str_ptr = '\0'; *str = '\0';
(*len)--; (*len)--;
return -EINVAL; return -EINVAL;
} }
while (shift > 0) { ret = scnprintf(str, *len, "%hhx.%hhx.%hhx", num >> 16, num >> 8, num);
shift -= 4; *len -= ret;
digit = ((num & mask) >> shift);
if (digit == 0 && remove_leading_zeros) {
*str_ptr = '0';
} else {
if (digit < 0xa)
*str_ptr = digit + '0';
else
*str_ptr = digit - 0xa + 'a';
remove_leading_zeros = 0;
str_ptr++;
(*len)--;
}
mask = mask >> 4;
if ((shift == 4*4) || (shift == 4*2)) {
if (remove_leading_zeros) {
str_ptr++;
(*len)--;
}
*str_ptr = '.';
str_ptr++;
(*len)--;
remove_leading_zeros = 1;
}
}
if (remove_leading_zeros)
(*len)--;
return 0; return 0;
} }