Skip to content

Commit

Permalink
bnx2x: Reuse bnx2x_null_format_ver()
Browse files Browse the repository at this point in the history
Reuse bnx2x_null_format_ver() in functions where it's appropriated
instead of open coded variant.

Signed-off-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Andy Shevchenko authored and David S. Miller committed May 1, 2017
1 parent 55b218c commit b77f016
Showing 1 changed file with 9 additions and 11 deletions.
20 changes: 9 additions & 11 deletions drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
Original file line number Diff line number Diff line change
Expand Up @@ -6161,14 +6161,20 @@ static void bnx2x_link_int_ack(struct link_params *params,
}
}

static int bnx2x_null_format_ver(u32 spirom_ver, u8 *str, u16 *len)
{
str[0] = '\0';
(*len)--;
return 0;
}

static int bnx2x_format_ver(u32 num, u8 *str, u16 *len)
{
u16 ret;

if (*len < 10) {
/* Need more than 10chars for this format */
*str = '\0';
(*len)--;
bnx2x_null_format_ver(num, str, len);
return -EINVAL;
}

Expand All @@ -6183,8 +6189,7 @@ static int bnx2x_3_seq_format_ver(u32 num, u8 *str, u16 *len)

if (*len < 10) {
/* Need more than 10chars for this format */
*str = '\0';
(*len)--;
bnx2x_null_format_ver(num, str, len);
return -EINVAL;
}

Expand All @@ -6193,13 +6198,6 @@ static int bnx2x_3_seq_format_ver(u32 num, u8 *str, u16 *len)
return 0;
}

static int bnx2x_null_format_ver(u32 spirom_ver, u8 *str, u16 *len)
{
str[0] = '\0';
(*len)--;
return 0;
}

int bnx2x_get_ext_phy_fw_version(struct link_params *params, u8 *version,
u16 len)
{
Expand Down

0 comments on commit b77f016

Please sign in to comment.