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.
Unified · Split
| @@ -245,20 +245,6 @@ enum QED_FEATURE { · 244 unmodified lines | |||
| 245 | QED_MAX_FEATURES, | 245 | QED_MAX_FEATURES, |
| 246 | }; | 246 | }; |
| 247 | 247 | ||
| 248 | enum QED_PORT_MODE { | ||
| 249 | QED_PORT_MODE_DE_2X40G, | ||
| 250 | QED_PORT_MODE_DE_2X50G, | ||
| 251 | QED_PORT_MODE_DE_1X100G, | ||
| 252 | QED_PORT_MODE_DE_4X10G_F, | ||
| 253 | QED_PORT_MODE_DE_4X10G_E, | ||
| 254 | QED_PORT_MODE_DE_4X20G, | ||
| 255 | QED_PORT_MODE_DE_1X40G, | ||
| 256 | QED_PORT_MODE_DE_2X25G, | ||
| 257 | QED_PORT_MODE_DE_1X25G, | ||
| 258 | QED_PORT_MODE_DE_4X25G, | ||
| 259 | QED_PORT_MODE_DE_2X10G, | ||
| 260 | }; | ||
| 261 | |||
| 262 | enum qed_dev_cap { | 248 | enum qed_dev_cap { |
| 263 | QED_DEV_CAP_ETH, | 249 | QED_DEV_CAP_ETH, |
| 264 | QED_DEV_CAP_FCOE, | 250 | QED_DEV_CAP_FCOE, |
| @@ -337,7 +323,6 @@ struct qed_hw_info { · 72 unmodified lines | |||
| 337 | 323 | ||
| 338 | struct qed_igu_info *p_igu_info; | 324 | struct qed_igu_info *p_igu_info; |
| 339 | 325 | ||
| 340 | u32 port_mode; | ||
| 341 | u32 hw_mode; | 326 | u32 hw_mode; |
| 342 | unsigned long device_capabilities; | 327 | unsigned long device_capabilities; |
| 343 | u16 mtu; | 328 | u16 mtu; |
| @@ -3994,37 +3994,16 @@ static int qed_hw_get_nvm_info(struct qed_hwfn *p_hwfn, struct qed_ptt *p_ptt) · 3993 unmodified lines | |||
| 3994 | switch ((core_cfg & NVM_CFG1_GLOB_NETWORK_PORT_MODE_MASK) >> | 3994 | switch ((core_cfg & NVM_CFG1_GLOB_NETWORK_PORT_MODE_MASK) >> |
| 3995 | NVM_CFG1_GLOB_NETWORK_PORT_MODE_OFFSET) { | 3995 | NVM_CFG1_GLOB_NETWORK_PORT_MODE_OFFSET) { |
| 3996 | case NVM_CFG1_GLOB_NETWORK_PORT_MODE_BB_2X40G: | 3996 | case NVM_CFG1_GLOB_NETWORK_PORT_MODE_BB_2X40G: |
| 3997 | p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_2X40G; | ||
| 3998 | break; | ||
| 3999 | case NVM_CFG1_GLOB_NETWORK_PORT_MODE_2X50G: | 3997 | case NVM_CFG1_GLOB_NETWORK_PORT_MODE_2X50G: |
| 4000 | p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_2X50G; | ||
| 4001 | break; | ||
| 4002 | case NVM_CFG1_GLOB_NETWORK_PORT_MODE_BB_1X100G: | 3998 | case NVM_CFG1_GLOB_NETWORK_PORT_MODE_BB_1X100G: |
| 4003 | p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_1X100G; | ||
| 4004 | break; | ||
| 4005 | case NVM_CFG1_GLOB_NETWORK_PORT_MODE_4X10G_F: | 3999 | case NVM_CFG1_GLOB_NETWORK_PORT_MODE_4X10G_F: |
| 4006 | p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_4X10G_F; | ||
| 4007 | break; | ||
| 4008 | case NVM_CFG1_GLOB_NETWORK_PORT_MODE_BB_4X10G_E: | 4000 | case NVM_CFG1_GLOB_NETWORK_PORT_MODE_BB_4X10G_E: |
| 4009 | p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_4X10G_E; | ||
| 4010 | break; | ||
| 4011 | case NVM_CFG1_GLOB_NETWORK_PORT_MODE_BB_4X20G: | 4001 | case NVM_CFG1_GLOB_NETWORK_PORT_MODE_BB_4X20G: |
| 4012 | p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_4X20G; | ||
| 4013 | break; | ||
| 4014 | case NVM_CFG1_GLOB_NETWORK_PORT_MODE_1X40G: | 4002 | case NVM_CFG1_GLOB_NETWORK_PORT_MODE_1X40G: |
| 4015 | p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_1X40G; | ||
| 4016 | break; | ||
| 4017 | case NVM_CFG1_GLOB_NETWORK_PORT_MODE_2X25G: | 4003 | case NVM_CFG1_GLOB_NETWORK_PORT_MODE_2X25G: |
| 4018 | p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_2X25G; | ||
| 4019 | break; | ||
| 4020 | case NVM_CFG1_GLOB_NETWORK_PORT_MODE_2X10G: | 4004 | case NVM_CFG1_GLOB_NETWORK_PORT_MODE_2X10G: |
| 4021 | p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_2X10G; | ||
| 4022 | break; | ||
| 4023 | case NVM_CFG1_GLOB_NETWORK_PORT_MODE_1X25G: | 4005 | case NVM_CFG1_GLOB_NETWORK_PORT_MODE_1X25G: |
| 4024 | p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_1X25G; | ||
| 4025 | break; | ||
| 4026 | case NVM_CFG1_GLOB_NETWORK_PORT_MODE_4X25G: | 4006 | case NVM_CFG1_GLOB_NETWORK_PORT_MODE_4X25G: |
| 4027 | p_hwfn->hw_info.port_mode = QED_PORT_MODE_DE_4X25G; | ||
| 4028 | break; | 4007 | break; |
| 4029 | default: | 4008 | default: |
| 4030 | DP_NOTICE(p_hwfn, "Unknown port mode in 0x%08x\n", core_cfg); | 4009 | DP_NOTICE(p_hwfn, "Unknown port mode in 0x%08x\n", core_cfg); |