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

Commit 5d5b7c39 authored by Emil Tantilov's avatar Emil Tantilov Committed by David S. Miller
Browse files

ixgbe: declare functions as static 



Following patch fixes warnings reported by `make namespacecheck`

Reported by Stephen Hemminger

CC: Stephen Hemminger <shemminger@vyatta.com>
Signed-off-by: default avatarEmil Tantilov <emil.s.tantilov@intel.com>
Tested-by: default avatarStephen Ko <stephen.s.ko@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f32f837b

drivers/net/ixgbe/ixgbe_82599.c

+15 −15
Original line number Original line Diff line number Diff line
@@ -39,10 +39,10 @@ 
#define IXGBE_82599_MC_TBL_SIZE   128

#define IXGBE_82599_MC_TBL_SIZE   128

#define IXGBE_82599_VFT_TBL_SIZE  128

#define IXGBE_82599_VFT_TBL_SIZE  128





void ixgbe_disable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw);

static void ixgbe_disable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw);

void ixgbe_enable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw);

static void ixgbe_enable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw);

void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw);

static void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw);

s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,

static s32 ixgbe_setup_mac_link_multispeed_fiber(struct ixgbe_hw *hw,

						 ixgbe_link_speed speed,

						 ixgbe_link_speed speed,

						 bool autoneg,

						 bool autoneg,

						 bool autoneg_wait_to_complete);

						 bool autoneg_wait_to_complete);
@@ -50,9 +50,9 @@ static s32 ixgbe_setup_mac_link_smartspeed(struct ixgbe_hw *hw, 
                                           ixgbe_link_speed speed,

                                           ixgbe_link_speed speed,

                                           bool autoneg,

                                           bool autoneg,

                                           bool autoneg_wait_to_complete);

                                           bool autoneg_wait_to_complete);

s32 ixgbe_start_mac_link_82599(struct ixgbe_hw *hw,

static s32 ixgbe_start_mac_link_82599(struct ixgbe_hw *hw,

				      bool autoneg_wait_to_complete);

				      bool autoneg_wait_to_complete);

s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw,

static s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw,

                               ixgbe_link_speed speed,

                               ixgbe_link_speed speed,

                               bool autoneg,

                               bool autoneg,

                               bool autoneg_wait_to_complete);

                               bool autoneg_wait_to_complete);
@@ -369,7 +369,7 @@ static enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw) 
 *  Configures link settings based on values in the ixgbe_hw struct.

 *  Configures link settings based on values in the ixgbe_hw struct.

 *  Restarts the link.  Performs autonegotiation if needed.

 *  Restarts the link.  Performs autonegotiation if needed.

 **/

 **/

s32 ixgbe_start_mac_link_82599(struct ixgbe_hw *hw,

static s32 ixgbe_start_mac_link_82599(struct ixgbe_hw *hw,

                               bool autoneg_wait_to_complete)

                               bool autoneg_wait_to_complete)

{

{

	u32 autoc_reg;

	u32 autoc_reg;
@@ -418,7 +418,7 @@ s32 ixgbe_start_mac_link_82599(struct ixgbe_hw *hw, 
  *  PHY states.  This includes selectively shutting down the Tx

  *  PHY states.  This includes selectively shutting down the Tx

  *  laser on the PHY, effectively halting physical link.

  *  laser on the PHY, effectively halting physical link.

  **/

  **/

void ixgbe_disable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)

static void ixgbe_disable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)

{

{

	u32 esdp_reg = IXGBE_READ_REG(hw, IXGBE_ESDP);

	u32 esdp_reg = IXGBE_READ_REG(hw, IXGBE_ESDP);
@@ -437,7 +437,7 @@ void ixgbe_disable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw) 
 *  PHY states.  This includes selectively turning on the Tx

 *  PHY states.  This includes selectively turning on the Tx

 *  laser on the PHY, effectively starting physical link.

 *  laser on the PHY, effectively starting physical link.

 **/

 **/

void ixgbe_enable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)

static void ixgbe_enable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)

{

{

	u32 esdp_reg = IXGBE_READ_REG(hw, IXGBE_ESDP);

	u32 esdp_reg = IXGBE_READ_REG(hw, IXGBE_ESDP);
@@ -460,7 +460,7 @@ void ixgbe_enable_tx_laser_multispeed_fiber(struct ixgbe_hw *hw) 
 *  end.  This is consistent with true clause 37 autoneg, which also

 *  end.  This is consistent with true clause 37 autoneg, which also

 *  involves a loss of signal.

 *  involves a loss of signal.

 **/

 **/

void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)

static void ixgbe_flap_tx_laser_multispeed_fiber(struct ixgbe_hw *hw)

{

{

	hw_dbg(hw, "ixgbe_flap_tx_laser_multispeed_fiber\n");

	hw_dbg(hw, "ixgbe_flap_tx_laser_multispeed_fiber\n");
@@ -729,7 +729,7 @@ static s32 ixgbe_setup_mac_link_smartspeed(struct ixgbe_hw *hw, 
 *

 *

 *  Set the link speed in the AUTOC register and restarts link.

 *  Set the link speed in the AUTOC register and restarts link.

 **/

 **/

s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw,

static s32 ixgbe_setup_mac_link_82599(struct ixgbe_hw *hw,

                               ixgbe_link_speed speed, bool autoneg,

                               ixgbe_link_speed speed, bool autoneg,

                               bool autoneg_wait_to_complete)

                               bool autoneg_wait_to_complete)

{

{

drivers/net/ixgbe/ixgbe_common.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -52,6 +52,7 @@ static void ixgbe_disable_rar(struct ixgbe_hw *hw, u32 index); 
static s32 ixgbe_mta_vector(struct ixgbe_hw *hw, u8 *mc_addr);

static s32 ixgbe_mta_vector(struct ixgbe_hw *hw, u8 *mc_addr);

static void ixgbe_add_uc_addr(struct ixgbe_hw *hw, u8 *addr, u32 vmdq);

static void ixgbe_add_uc_addr(struct ixgbe_hw *hw, u8 *addr, u32 vmdq);

static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num);

static s32 ixgbe_setup_fc(struct ixgbe_hw *hw, s32 packetbuf_num);

static s32 ixgbe_poll_eerd_eewr_done(struct ixgbe_hw *hw, u32 ee_reg);





/**

/**

 *  ixgbe_start_hw_generic - Prepare hardware for Tx/Rx

 *  ixgbe_start_hw_generic - Prepare hardware for Tx/Rx
@@ -637,7 +638,7 @@ s32 ixgbe_read_eerd_generic(struct ixgbe_hw *hw, u16 offset, u16 *data) 
 *  Polls the status bit (bit 1) of the EERD or EEWR to determine when the

 *  Polls the status bit (bit 1) of the EERD or EEWR to determine when the

 *  read or write is done respectively.

 *  read or write is done respectively.

 **/

 **/

s32 ixgbe_poll_eerd_eewr_done(struct ixgbe_hw *hw, u32 ee_reg)

static s32 ixgbe_poll_eerd_eewr_done(struct ixgbe_hw *hw, u32 ee_reg)

{

{

	u32 i;

	u32 i;

	u32 reg;

	u32 reg;
@@ -2449,7 +2450,7 @@ s32 ixgbe_init_uta_tables_generic(struct ixgbe_hw *hw) 
 *  return the VLVF index where this VLAN id should be placed

 *  return the VLVF index where this VLAN id should be placed

 *

 *

 **/

 **/

s32 ixgbe_find_vlvf_slot(struct ixgbe_hw *hw, u32 vlan)

static s32 ixgbe_find_vlvf_slot(struct ixgbe_hw *hw, u32 vlan)

{

{

	u32 bits = 0;

	u32 bits = 0;

	u32 first_empty_slot = 0;

	u32 first_empty_slot = 0;

drivers/net/ixgbe/ixgbe_common.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -52,7 +52,6 @@ s32 ixgbe_read_eeprom_bit_bang_generic(struct ixgbe_hw *hw, u16 offset, 
s32 ixgbe_validate_eeprom_checksum_generic(struct ixgbe_hw *hw,

s32 ixgbe_validate_eeprom_checksum_generic(struct ixgbe_hw *hw,

                                           u16 *checksum_val);

                                           u16 *checksum_val);

s32 ixgbe_update_eeprom_checksum_generic(struct ixgbe_hw *hw);

s32 ixgbe_update_eeprom_checksum_generic(struct ixgbe_hw *hw);

s32 ixgbe_poll_eerd_eewr_done(struct ixgbe_hw *hw, u32 ee_reg);





s32 ixgbe_set_rar_generic(struct ixgbe_hw *hw, u32 index, u8 *addr, u32 vmdq,

s32 ixgbe_set_rar_generic(struct ixgbe_hw *hw, u32 index, u8 *addr, u32 vmdq,

                          u32 enable_addr);

                          u32 enable_addr);

drivers/net/ixgbe/ixgbe_dcb_82598.c

+4 −4
Original line number Original line Diff line number Diff line
@@ -78,7 +78,7 @@ static s32 ixgbe_dcb_config_packet_buffers_82598(struct ixgbe_hw *hw, 
 *

 *

 * Configure Rx Data Arbiter and credits for each traffic class.

 * Configure Rx Data Arbiter and credits for each traffic class.

 */

 */

s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *hw,

static s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *hw,

                                      struct ixgbe_dcb_config *dcb_config)

                                      struct ixgbe_dcb_config *dcb_config)

{

{

	struct tc_bw_alloc    *p;

	struct tc_bw_alloc    *p;
@@ -135,7 +135,7 @@ s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *hw, 
 *

 *

 * Configure Tx Descriptor Arbiter and credits for each traffic class.

 * Configure Tx Descriptor Arbiter and credits for each traffic class.

 */

 */

s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,

static s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw,

                                           struct ixgbe_dcb_config *dcb_config)

                                           struct ixgbe_dcb_config *dcb_config)

{

{

	struct tc_bw_alloc *p;

	struct tc_bw_alloc *p;
@@ -183,7 +183,7 @@ s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *hw, 
 *

 *

 * Configure Tx Data Arbiter and credits for each traffic class.

 * Configure Tx Data Arbiter and credits for each traffic class.

 */

 */

s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *hw,

static s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *hw,

                                           struct ixgbe_dcb_config *dcb_config)

                                           struct ixgbe_dcb_config *dcb_config)

{

{

	struct tc_bw_alloc *p;

	struct tc_bw_alloc *p;
@@ -296,7 +296,7 @@ s32 ixgbe_dcb_config_pfc_82598(struct ixgbe_hw *hw, 
 * Configure queue statistics registers, all queues belonging to same traffic

 * Configure queue statistics registers, all queues belonging to same traffic

 * class uses a single set of queue statistics counters.

 * class uses a single set of queue statistics counters.

 */

 */

s32 ixgbe_dcb_config_tc_stats_82598(struct ixgbe_hw *hw)

static s32 ixgbe_dcb_config_tc_stats_82598(struct ixgbe_hw *hw)

{

{

	u32 reg = 0;

	u32 reg = 0;

	u8  i   = 0;

	u8  i   = 0;

drivers/net/ixgbe/ixgbe_dcb_82598.h

+0 −11
Original line number Original line Diff line number Diff line
@@ -73,17 +73,6 @@ 
/* DCB PFC functions */

/* DCB PFC functions */

s32 ixgbe_dcb_config_pfc_82598(struct ixgbe_hw *, struct ixgbe_dcb_config *);

s32 ixgbe_dcb_config_pfc_82598(struct ixgbe_hw *, struct ixgbe_dcb_config *);





/* DCB traffic class stats */

s32 ixgbe_dcb_config_tc_stats_82598(struct ixgbe_hw *);



/* DCB config arbiters */

s32 ixgbe_dcb_config_tx_desc_arbiter_82598(struct ixgbe_hw *,

                                           struct ixgbe_dcb_config *);

s32 ixgbe_dcb_config_tx_data_arbiter_82598(struct ixgbe_hw *,

                                           struct ixgbe_dcb_config *);

s32 ixgbe_dcb_config_rx_arbiter_82598(struct ixgbe_hw *,

                                      struct ixgbe_dcb_config *);



/* DCB hw initialization */

/* DCB hw initialization */

s32 ixgbe_dcb_hw_config_82598(struct ixgbe_hw *, struct ixgbe_dcb_config *);

s32 ixgbe_dcb_hw_config_82598(struct ixgbe_hw *, struct ixgbe_dcb_config *);