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

Commit 855c40fc authored by Jacob Keller's avatar Jacob Keller Committed by Jeff Kirsher
Browse files

fm10k: remove is_slot_appropriate 



This function is no longer used now that we have updated fm10k_slot_warn
functionality.

Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Tested-by: default avatarKrishneil Singh <krishneil.k.singh@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent b655a5c7

drivers/net/ethernet/intel/fm10k/fm10k_pf.c

+0 −14
Original line number Diff line number Diff line
@@ -184,19 +184,6 @@ static s32 fm10k_init_hw_pf(struct fm10k_hw *hw) 
	return 0;

}



/**

 *  fm10k_is_slot_appropriate_pf - Indicate appropriate slot for this SKU

 *  @hw: pointer to hardware structure

 *

 *  Looks at the PCIe bus info to confirm whether or not this slot can support

 *  the necessary bandwidth for this device.

 **/

static bool fm10k_is_slot_appropriate_pf(struct fm10k_hw *hw)

{

	return (hw->bus.speed == hw->bus_caps.speed) &&

	       (hw->bus.width == hw->bus_caps.width);

}



/**

 *  fm10k_update_vlan_pf - Update status of VLAN ID in VLAN filter table

 *  @hw: pointer to hardware structure
@@ -1849,7 +1836,6 @@ static struct fm10k_mac_ops mac_ops_pf = { 
	.init_hw		= &fm10k_init_hw_pf,

	.start_hw		= &fm10k_start_hw_generic,

	.stop_hw		= &fm10k_stop_hw_generic,

	.is_slot_appropriate	= &fm10k_is_slot_appropriate_pf,

	.update_vlan		= &fm10k_update_vlan_pf,

	.read_mac_addr		= &fm10k_read_mac_addr_pf,

	.update_uc_addr		= &fm10k_update_uc_addr_pf,

drivers/net/ethernet/intel/fm10k/fm10k_type.h

+0 −1
Original line number Diff line number Diff line
@@ -521,7 +521,6 @@ struct fm10k_mac_ops { 
	s32 (*stop_hw)(struct fm10k_hw *);

	s32 (*get_bus_info)(struct fm10k_hw *);

	s32 (*get_host_state)(struct fm10k_hw *, bool *);

	bool (*is_slot_appropriate)(struct fm10k_hw *);

	s32 (*update_vlan)(struct fm10k_hw *, u32, u8, bool);

	s32 (*read_mac_addr)(struct fm10k_hw *);

	s32 (*update_uc_addr)(struct fm10k_hw *, u16, const u8 *,

drivers/net/ethernet/intel/fm10k/fm10k_vf.c

+0 −14
Original line number Diff line number Diff line
@@ -131,19 +131,6 @@ static s32 fm10k_init_hw_vf(struct fm10k_hw *hw) 
	return 0;

}



/**

 *  fm10k_is_slot_appropriate_vf - Indicate appropriate slot for this SKU

 *  @hw: pointer to hardware structure

 *

 *  Looks at the PCIe bus info to confirm whether or not this slot can support

 *  the necessary bandwidth for this device. Since the VF has no control over

 *  the "slot" it is in, always indicate that the slot is appropriate.

 **/

static bool fm10k_is_slot_appropriate_vf(struct fm10k_hw *hw)

{

	return true;

}



/* This structure defines the attibutes to be parsed below */

const struct fm10k_tlv_attr fm10k_mac_vlan_msg_attr[] = {

	FM10K_TLV_ATTR_U32(FM10K_MAC_VLAN_MSG_VLAN),
@@ -552,7 +539,6 @@ static struct fm10k_mac_ops mac_ops_vf = { 
	.init_hw		= &fm10k_init_hw_vf,

	.start_hw		= &fm10k_start_hw_generic,

	.stop_hw		= &fm10k_stop_hw_vf,

	.is_slot_appropriate	= &fm10k_is_slot_appropriate_vf,

	.update_vlan		= &fm10k_update_vlan_vf,

	.read_mac_addr		= &fm10k_read_mac_addr_vf,

	.update_uc_addr		= &fm10k_update_uc_addr_vf,