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

Commit af28eec9 authored by Stephen Hemminger's avatar Stephen Hemminger Committed by Jeff Kirsher
Browse files

i40e: make functions static and remove dead code 



Make local functions static in the file they are used.

Remove functions i40e_aq_add_vlan and i40e_aq_remove_vlan since
they are not used anywhere by current code.

Signed-off-by: default avatarStephen Hemminger <stephen@networkplumber.org>
Tested-by: default avatarKavindya Deegala <kavindya.s.deegala@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 5561b6a1

drivers/net/ethernet/intel/i40e/i40e_adminq.c

+4 −2
Original line number Diff line number Diff line
@@ -31,6 +31,8 @@ 
#include "i40e_adminq.h"

#include "i40e_prototype.h"



static void i40e_resume_aq(struct i40e_hw *hw);



/**

 *  i40e_adminq_init_regs - Initialize AdminQ registers

 *  @hw: pointer to the hardware structure
@@ -675,7 +677,7 @@ static u16 i40e_clean_asq(struct i40e_hw *hw) 
 *  Returns true if the firmware has processed all descriptors on the

 *  admin send queue. Returns false if there are still requests pending.

 **/

bool i40e_asq_done(struct i40e_hw *hw)

static bool i40e_asq_done(struct i40e_hw *hw)

{

	/* AQ designers suggest use of head for better

	 * timing reliability than DD bit
@@ -963,7 +965,7 @@ i40e_status i40e_clean_arq_element(struct i40e_hw *hw, 
	return ret_code;

}



void i40e_resume_aq(struct i40e_hw *hw)

static void i40e_resume_aq(struct i40e_hw *hw)

{

	u32 reg = 0;

drivers/net/ethernet/intel/i40e/i40e_common.c

+0 −80
Original line number Diff line number Diff line
@@ -1128,86 +1128,6 @@ i40e_status i40e_aq_remove_macvlan(struct i40e_hw *hw, u16 seid, 
	return status;

}



/**

 * i40e_aq_add_vlan - Add VLAN ids to the HW filtering

 * @hw: pointer to the hw struct

 * @seid: VSI for the vlan filters

 * @v_list: list of vlan filters to be added

 * @count: length of the list

 * @cmd_details: pointer to command details structure or NULL

 **/

i40e_status i40e_aq_add_vlan(struct i40e_hw *hw, u16 seid,

			struct i40e_aqc_add_remove_vlan_element_data *v_list,

			u8 count, struct i40e_asq_cmd_details *cmd_details)

{

	struct i40e_aq_desc desc;

	struct i40e_aqc_macvlan *cmd =

		(struct i40e_aqc_macvlan *)&desc.params.raw;

	i40e_status status;

	u16 buf_size;



	if (count == 0 || !v_list || !hw)

		return I40E_ERR_PARAM;



	buf_size = count * sizeof(struct i40e_aqc_add_remove_vlan_element_data);



	/* prep the rest of the request */

	i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_add_vlan);

	cmd->num_addresses = cpu_to_le16(count);

	cmd->seid[0] = cpu_to_le16(seid | I40E_AQC_MACVLAN_CMD_SEID_VALID);

	cmd->seid[1] = 0;

	cmd->seid[2] = 0;



	desc.flags |= cpu_to_le16((u16)(I40E_AQ_FLAG_BUF | I40E_AQ_FLAG_RD));

	if (buf_size > I40E_AQ_LARGE_BUF)

		desc.flags |= cpu_to_le16((u16)I40E_AQ_FLAG_LB);



	status = i40e_asq_send_command(hw, &desc, v_list, buf_size,

				       cmd_details);



	return status;

}



/**

 * i40e_aq_remove_vlan - Remove VLANs from the HW filtering

 * @hw: pointer to the hw struct

 * @seid: VSI for the vlan filters

 * @v_list: list of macvlans to be removed

 * @count: length of the list

 * @cmd_details: pointer to command details structure or NULL

 **/

i40e_status i40e_aq_remove_vlan(struct i40e_hw *hw, u16 seid,

			struct i40e_aqc_add_remove_vlan_element_data *v_list,

			u8 count, struct i40e_asq_cmd_details *cmd_details)

{

	struct i40e_aq_desc desc;

	struct i40e_aqc_macvlan *cmd =

		(struct i40e_aqc_macvlan *)&desc.params.raw;

	i40e_status status;

	u16 buf_size;



	if (count == 0 || !v_list || !hw)

		return I40E_ERR_PARAM;



	buf_size = count * sizeof(struct i40e_aqc_add_remove_vlan_element_data);



	/* prep the rest of the request */

	i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_remove_vlan);

	cmd->num_addresses = cpu_to_le16(count);

	cmd->seid[0] = cpu_to_le16(seid | I40E_AQC_MACVLAN_CMD_SEID_VALID);

	cmd->seid[1] = 0;

	cmd->seid[2] = 0;



	desc.flags |= cpu_to_le16((u16)(I40E_AQ_FLAG_BUF | I40E_AQ_FLAG_RD));

	if (buf_size > I40E_AQ_LARGE_BUF)

		desc.flags |= cpu_to_le16((u16)I40E_AQ_FLAG_LB);



	status = i40e_asq_send_command(hw, &desc, v_list, buf_size,

				       cmd_details);



	return status;

}



/**

 * i40e_aq_send_msg_to_vf

 * @hw: pointer to the hardware structure

drivers/net/ethernet/intel/i40e/i40e_prototype.h

+0 −8
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ i40e_status i40e_asq_send_command(struct i40e_hw *hw, 
				void *buff, /* can be NULL */

				u16  buff_size,

				struct i40e_asq_cmd_details *cmd_details);

bool i40e_asq_done(struct i40e_hw *hw);



/* debug function for adminq */

void i40e_debug_aq(struct i40e_hw *hw,
@@ -60,7 +59,6 @@ void i40e_debug_aq(struct i40e_hw *hw, 
		   void *buffer);



void i40e_idle_aq(struct i40e_hw *hw);

void i40e_resume_aq(struct i40e_hw *hw);



u32 i40e_led_get(struct i40e_hw *hw);

void i40e_led_set(struct i40e_hw *hw, u32 mode);
@@ -120,12 +118,6 @@ i40e_status i40e_aq_add_macvlan(struct i40e_hw *hw, u16 vsi_id, 
i40e_status i40e_aq_remove_macvlan(struct i40e_hw *hw, u16 vsi_id,

			struct i40e_aqc_remove_macvlan_element_data *mv_list,

			u16 count, struct i40e_asq_cmd_details *cmd_details);

i40e_status i40e_aq_add_vlan(struct i40e_hw *hw, u16 vsi_id,

			struct i40e_aqc_add_remove_vlan_element_data *v_list,

			u8 count, struct i40e_asq_cmd_details *cmd_details);

i40e_status i40e_aq_remove_vlan(struct i40e_hw *hw, u16 vsi_id,

			struct i40e_aqc_add_remove_vlan_element_data *v_list,

			u8 count, struct i40e_asq_cmd_details *cmd_details);

i40e_status i40e_aq_send_msg_to_vf(struct i40e_hw *hw, u16 vfid,

				u32 v_opcode, u32 v_retval, u8 *msg, u16 msglen,

				struct i40e_asq_cmd_details *cmd_details);