Commit e9a5eb85 authored by Alexander Lobakin's avatar Alexander Lobakin Committed by David S. Miller
Browse files

qed: remove unused qed_hw_info::port_mode and QED_PORT_MODE 



Struct field qed_hw_info::port_mode isn't used anywhere in the code, so
can be safely removed to prevent possible dead code addition.
Also remove the enumeration QED_PORT_MODE orphaned after this deletion.

Signed-off-by: default avatarAlexander Lobakin <alobakin@marvell.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5d4193c6

drivers/net/ethernet/qlogic/qed/qed.h

+0 −15
Original line number Diff line number Diff line
@@ -245,20 +245,6 @@ enum QED_FEATURE { 
	QED_MAX_FEATURES,

};



enum QED_PORT_MODE {

	QED_PORT_MODE_DE_2X40G,

	QED_PORT_MODE_DE_2X50G,

	QED_PORT_MODE_DE_1X100G,

	QED_PORT_MODE_DE_4X10G_F,

	QED_PORT_MODE_DE_4X10G_E,

	QED_PORT_MODE_DE_4X20G,

	QED_PORT_MODE_DE_1X40G,

	QED_PORT_MODE_DE_2X25G,

	QED_PORT_MODE_DE_1X25G,

	QED_PORT_MODE_DE_4X25G,

	QED_PORT_MODE_DE_2X10G,

};



enum qed_dev_cap {

	QED_DEV_CAP_ETH,

	QED_DEV_CAP_FCOE,
@@ -337,7 +323,6 @@ struct qed_hw_info { 


	struct qed_igu_info		*p_igu_info;



	u32				port_mode;

	u32				hw_mode;

	unsigned long			device_capabilities;

	u16				mtu;

drivers/net/ethernet/qlogic/qed/qed_dev.c

+0 −21
Original line number Diff line number Diff line
@@ -3994,37 +3994,16 @@ static int qed_hw_get_nvm_info(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) 
	switch ((core_cfg & NVM_CFG1_GLOB_NETWORK_PORT_MODE_MASK) >>

		NVM_CFG1_GLOB_NETWORK_PORT_MODE_OFFSET) {

	case NVM_CFG1_GLOB_NETWORK_PORT_MODE_BB_2X40G:

		p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_2X40G;

		break;

	case NVM_CFG1_GLOB_NETWORK_PORT_MODE_2X50G:

		p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_2X50G;

		break;

	case NVM_CFG1_GLOB_NETWORK_PORT_MODE_BB_1X100G:

		p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_1X100G;

		break;

	case NVM_CFG1_GLOB_NETWORK_PORT_MODE_4X10G_F:

		p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_4X10G_F;

		break;

	case NVM_CFG1_GLOB_NETWORK_PORT_MODE_BB_4X10G_E:

		p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_4X10G_E;

		break;

	case NVM_CFG1_GLOB_NETWORK_PORT_MODE_BB_4X20G:

		p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_4X20G;

		break;

	case NVM_CFG1_GLOB_NETWORK_PORT_MODE_1X40G:

		p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_1X40G;

		break;

	case NVM_CFG1_GLOB_NETWORK_PORT_MODE_2X25G:

		p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_2X25G;

		break;

	case NVM_CFG1_GLOB_NETWORK_PORT_MODE_2X10G:

		p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_2X10G;

		break;

	case NVM_CFG1_GLOB_NETWORK_PORT_MODE_1X25G:

		p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_1X25G;

		break;

	case NVM_CFG1_GLOB_NETWORK_PORT_MODE_4X25G:

		p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_4X25G;

		break;

	default:

		DP_NOTICE(p_hwfn, "Unknown port mode in 0x%08x\n", core_cfg);