|
@@ -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;
|
|
|
}
|
|
|
|
|
@@ -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;
|
|
|
}
|
|
|
|
|
@@ -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)
|
|
|
{
|