bnx2x: Reuse bnx2x_null_format_ver()

andy-shev · davem330 · commit b77f016726bd · 2017-04-30T22:28:00.000-04:00
Reuse bnx2x_null_format_ver() in functions where it's appropriated
instead of open coded variant.

Signed-off-by: Andy Shevchenko &lt;andy.shevchenko@gmail.com&gt;
Signed-off-by: David S. Miller &lt;davem@davemloft.net&gt;
diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c
@@ -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)
 {

Original file line number	Diff line number	Diff line change
`@@ -6161,14 +6161,20 @@ static void bnx2x_link_int_ack(struct link_params *params,`
`6161`	`6161`	`}`
`6162`	`6162`	`}`
`6163`	`6163`
	`6164`	`+static int bnx2x_null_format_ver(u32 spirom_ver, u8 str, u16 len)`
	`6165`	`+{`
	`6166`	`+ str[0] = '\0';`
	`6167`	`+ (*len)--;`
	`6168`	`+ return 0;`
	`6169`	`+}`
	`6170`	`+`
`6164`	`6171`	`static int bnx2x_format_ver(u32 num, u8 str, u16 len)`
`6165`	`6172`	`{`
`6166`	`6173`	`u16 ret;`
`6167`	`6174`
`6168`	`6175`	`if (*len < 10) {`
`6169`	`6176`	`/* Need more than 10chars for this format */`
`6170`		`- *str = '\0';`
`6171`		`- (*len)--;`
	`6177`	`+ bnx2x_null_format_ver(num, str, len);`
`6172`	`6178`	`return -EINVAL;`
`6173`	`6179`	`}`
`6174`	`6180`
`@@ -6183,8 +6189,7 @@ static int bnx2x_3_seq_format_ver(u32 num, u8 str, u16 len)`
`6183`	`6189`
`6184`	`6190`	`if (*len < 10) {`
`6185`	`6191`	`/* Need more than 10chars for this format */`
`6186`		`- *str = '\0';`
`6187`		`- (*len)--;`
	`6192`	`+ bnx2x_null_format_ver(num, str, len);`
`6188`	`6193`	`return -EINVAL;`
`6189`	`6194`	`}`
`6190`	`6195`
`@@ -6193,13 +6198,6 @@ static int bnx2x_3_seq_format_ver(u32 num, u8 str, u16 len)`
`6193`	`6198`	`return 0;`
`6194`	`6199`	`}`
`6195`	`6200`
`6196`		`-static int bnx2x_null_format_ver(u32 spirom_ver, u8 str, u16 len)`
`6197`		`-{`
`6198`		`- str[0] = '\0';`
`6199`		`- (*len)--;`
`6200`		`- return 0;`
`6201`		`-}`
`6202`		`-`
`6203`	`6201`	`int bnx2x_get_ext_phy_fw_version(struct link_params params, u8 version,`
`6204`	`6202`	`u16 len)`
`6205`	`6203`	`{`