Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b2bda2f7 authored by Peter Senna Tschudin's avatar Peter Senna Tschudin Committed by David S. Miller
Browse files

bnx2x: Remove useless return variables 



This patch remove variables that are initialized with a constant,
are never updated, and are only used as parameter of return.
Return the constant instead of using a variable.

Verified by compilation only.

The coccinelle script that find and fixes this issue is:
// <smpl>
@@
type T;
constant C;
identifier ret;
@@
- T ret = C;
... when != ret
    when strict
return
- ret
+ C
;
// </smpl>

Signed-off-by: default avatarPeter Senna Tschudin <peter.senna@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3afc557d

drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c

+4 −6
Original line number Diff line number Diff line
@@ -2218,7 +2218,6 @@ int bnx2x_update_pfc(struct link_params *params, 
	 */

	u32 val;

	struct bnx2x *bp = params->bp;

	int bnx2x_status = 0;

	u8 bmac_loopback = (params->loopback_mode == LOOPBACK_BMAC);



	if (params->feature_config_flags & FEATURE_CONFIG_PFC_ENABLED)
@@ -2232,7 +2231,7 @@ int bnx2x_update_pfc(struct link_params *params, 
	bnx2x_update_pfc_nig(params, vars, pfc_params);



	if (!vars->link_up)

		return bnx2x_status;

		return 0;



	DP(NETIF_MSG_LINK, "About to update PFC in BMAC\n");
@@ -2246,7 +2245,7 @@ int bnx2x_update_pfc(struct link_params *params, 
		    == 0) {

			DP(NETIF_MSG_LINK, "About to update PFC in EMAC\n");

			bnx2x_emac_enable(params, vars, 0);

			return bnx2x_status;

			return 0;

		}

		if (CHIP_IS_E2(bp))

			bnx2x_update_pfc_bmac2(params, vars, bmac_loopback);
@@ -2260,7 +2259,7 @@ int bnx2x_update_pfc(struct link_params *params, 
			val = 1;

		REG_WR(bp, NIG_REG_BMAC0_PAUSE_OUT_EN + params->port*4, val);

	}

	return bnx2x_status;

	return 0;

}



static int bnx2x_bmac1_enable(struct link_params *params,
@@ -6473,7 +6472,6 @@ int bnx2x_test_link(struct link_params *params, struct link_vars *vars, 
static int bnx2x_link_initialize(struct link_params *params,

				 struct link_vars *vars)

{

	int rc = 0;

	u8 phy_index, non_ext_phy;

	struct bnx2x *bp = params->bp;

	/* In case of external phy existence, the line speed would be the
@@ -6546,7 +6544,7 @@ static int bnx2x_link_initialize(struct link_params *params, 
			NIG_STATUS_XGXS0_LINK_STATUS |

			NIG_STATUS_SERDES0_LINK_STATUS |

			NIG_MASK_MI_INT));

	return rc;

	return 0;

}



static void bnx2x_int_link_reset(struct bnx2x_phy *phy,