Commit 90a1bb98 authored by Andy Shevchenko's avatar Andy Shevchenko Committed by David S. Miller

bnx2x: Get rid of useless temporary variable

Replace pattern

 int status;
 ...
 status = func(...);
 return status;

by

 return func(...);

No functional change intented.
Signed-off-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b77f0167
...@@ -10618,22 +10618,19 @@ static u8 bnx2x_848xx_read_status(struct bnx2x_phy *phy, ...@@ -10618,22 +10618,19 @@ static u8 bnx2x_848xx_read_status(struct bnx2x_phy *phy,
static int bnx2x_8485x_format_ver(u32 raw_ver, u8 *str, u16 *len) static int bnx2x_8485x_format_ver(u32 raw_ver, u8 *str, u16 *len)
{ {
int status = 0;
u32 num; u32 num;
num = ((raw_ver & 0xF80) >> 7) << 16 | ((raw_ver & 0x7F) << 8) | num = ((raw_ver & 0xF80) >> 7) << 16 | ((raw_ver & 0x7F) << 8) |
((raw_ver & 0xF000) >> 12); ((raw_ver & 0xF000) >> 12);
status = bnx2x_3_seq_format_ver(num, str, len); return bnx2x_3_seq_format_ver(num, str, len);
return status;
} }
static int bnx2x_848xx_format_ver(u32 raw_ver, u8 *str, u16 *len) static int bnx2x_848xx_format_ver(u32 raw_ver, u8 *str, u16 *len)
{ {
int status = 0;
u32 spirom_ver; u32 spirom_ver;
spirom_ver = ((raw_ver & 0xF80) >> 7) << 16 | (raw_ver & 0x7F); spirom_ver = ((raw_ver & 0xF80) >> 7) << 16 | (raw_ver & 0x7F);
status = bnx2x_format_ver(spirom_ver, str, len); return bnx2x_format_ver(spirom_ver, str, len);
return status;
} }
static void bnx2x_8481_hw_reset(struct bnx2x_phy *phy, static void bnx2x_8481_hw_reset(struct bnx2x_phy *phy,
...@@ -12484,13 +12481,12 @@ static int bnx2x_populate_ext_phy(struct bnx2x *bp, ...@@ -12484,13 +12481,12 @@ static int bnx2x_populate_ext_phy(struct bnx2x *bp,
static int bnx2x_populate_phy(struct bnx2x *bp, u8 phy_index, u32 shmem_base, static int bnx2x_populate_phy(struct bnx2x *bp, u8 phy_index, u32 shmem_base,
u32 shmem2_base, u8 port, struct bnx2x_phy *phy) u32 shmem2_base, u8 port, struct bnx2x_phy *phy)
{ {
int status = 0;
phy->type = PORT_HW_CFG_XGXS_EXT_PHY_TYPE_NOT_CONN; phy->type = PORT_HW_CFG_XGXS_EXT_PHY_TYPE_NOT_CONN;
if (phy_index == INT_PHY) if (phy_index == INT_PHY)
return bnx2x_populate_int_phy(bp, shmem_base, port, phy); return bnx2x_populate_int_phy(bp, shmem_base, port, phy);
status = bnx2x_populate_ext_phy(bp, phy_index, shmem_base, shmem2_base,
return bnx2x_populate_ext_phy(bp, phy_index, shmem_base, shmem2_base,
port, phy); port, phy);
return status;
} }
static void bnx2x_phy_def_cfg(struct link_params *params, static void bnx2x_phy_def_cfg(struct link_params *params,
......
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