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

Commit 65a001ba authored by Yaniv Rosner's avatar Yaniv Rosner Committed by David S. Miller
Browse files

bnx2x: Fix compilation warning messages 



Fix annoying compilation warning, mainly related to static declarations

Signed-off-by: default avatarYaniv Rosner <yanivr@broadcom.com>
Signed-off-by: default avatarEilon Greenstein <eilong@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2cf7acf9

drivers/net/bnx2x/bnx2x_link.c

+6 −12
Original line number Diff line number Diff line
@@ -183,12 +183,6 @@ 
		(_bank + (_addr & 0xf)), \

		_val)



static u8 bnx2x_cl45_read(struct bnx2x *bp, struct bnx2x_phy *phy,

			  u8 devad, u16 reg, u16 *ret_val);



static u8 bnx2x_cl45_write(struct bnx2x *bp, struct bnx2x_phy *phy,

			   u8 devad, u16 reg, u16 val);



static u32 bnx2x_bits_en(struct bnx2x *bp, u32 reg, u32 bits)

{

	u32 val = REG_RD(bp, reg);
@@ -269,7 +263,7 @@ void bnx2x_ets_disabled(struct link_params *params) 
	REG_WR(bp, PBF_REG_NUM_STRICT_ARB_SLOTS, 0);

}



void bnx2x_ets_bw_limit_common(const struct link_params *params)

static void bnx2x_ets_bw_limit_common(const struct link_params *params)

{

	/* ETS disabled configuration */

	struct bnx2x *bp = params->bp;
@@ -1391,7 +1385,7 @@ static u32 bnx2x_get_emac_base(struct bnx2x *bp, 
/******************************************************************/

/*			CL45 access functions			  */

/******************************************************************/

u8 bnx2x_cl45_write(struct bnx2x *bp, struct bnx2x_phy *phy,

static u8 bnx2x_cl45_write(struct bnx2x *bp, struct bnx2x_phy *phy,

			   u8 devad, u16 reg, u16 val)

{

	u32 tmp, saved_mode;
@@ -1458,7 +1452,7 @@ u8 bnx2x_cl45_write(struct bnx2x *bp, struct bnx2x_phy *phy, 
	return rc;

}



u8 bnx2x_cl45_read(struct bnx2x *bp, struct bnx2x_phy *phy,

static u8 bnx2x_cl45_read(struct bnx2x *bp, struct bnx2x_phy *phy,

			  u8 devad, u16 reg, u16 *ret_val)

{

	u32 val, saved_mode;
@@ -4614,7 +4608,7 @@ static u8 bnx2x_8727_read_sfp_module_eeprom(struct bnx2x_phy *phy, 
		DP(NETIF_MSG_LINK,

			 "Got bad status 0x%x when reading from SFP+ EEPROM\n",

			 (val & MDIO_PMA_REG_SFP_TWO_WIRE_CTRL_STATUS_MASK));

		return -EINVAL;

		return -EFAULT;

	}



	/* Read the buffer */

drivers/net/bnx2x/bnx2x_link.h

+5 −0
Original line number Diff line number Diff line
@@ -337,6 +337,11 @@ void bnx2x_ext_phy_hw_reset(struct bnx2x *bp, u8 port); 
/* Reset the external of SFX7101 */

void bnx2x_sfx7101_sp_sw_reset(struct bnx2x *bp, struct bnx2x_phy *phy);



/* Read "byte_cnt" bytes from address "addr" from the SFP+ EEPROM */

u8 bnx2x_read_sfp_module_eeprom(struct bnx2x_phy *phy,

				struct link_params *params, u16 addr,

				u8 byte_cnt, u8 *o_buf);



void bnx2x_hw_reset_phy(struct link_params *params);



/* Checks if HW lock is required for this phy/board type */