diff options
author | Jesse Brandeburg <jesse.brandeburg@intel.com> | 2015-04-07 19:45:40 -0400 |
---|---|---|
committer | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2015-04-14 23:39:41 -0400 |
commit | 0f575bf3382d5bdb58ba571b1fd573b994bb11ba (patch) | |
tree | 45e6b72e1b7cfcf9c2482e80c845e0eedf10372b /drivers/net/ethernet/intel/i40e | |
parent | c1147280d2a336ac6723a8dc8b74f809fd6db02c (diff) |
i40e: get rid of unused locals
These changes just remove unused variables and any code that uses them
as the results of storing into these variables doesn't have any
side effects that I can see or provide any benefit.
Change-ID: I8a5ec7132ff1443d23aae729cef94beaaaf19e3a
Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com>
Tested-by: Jim Young <james.m.young@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers/net/ethernet/intel/i40e')
-rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_dcb.c | 6 | ||||
-rw-r--r-- | drivers/net/ethernet/intel/i40e/i40e_nvm.c | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/drivers/net/ethernet/intel/i40e/i40e_dcb.c b/drivers/net/ethernet/intel/i40e/i40e_dcb.c index 6e1466756760..2547aa21b2ca 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_dcb.c +++ b/drivers/net/ethernet/intel/i40e/i40e_dcb.c | |||
@@ -419,7 +419,7 @@ static void i40e_cee_to_dcb_v1_config( | |||
419 | { | 419 | { |
420 | u16 status, tlv_status = le16_to_cpu(cee_cfg->tlv_status); | 420 | u16 status, tlv_status = le16_to_cpu(cee_cfg->tlv_status); |
421 | u16 app_prio = le16_to_cpu(cee_cfg->oper_app_prio); | 421 | u16 app_prio = le16_to_cpu(cee_cfg->oper_app_prio); |
422 | u8 i, tc, err, sync, oper; | 422 | u8 i, tc, err; |
423 | 423 | ||
424 | /* CEE PG data to ETS config */ | 424 | /* CEE PG data to ETS config */ |
425 | dcbcfg->etscfg.maxtcs = cee_cfg->oper_num_tc; | 425 | dcbcfg->etscfg.maxtcs = cee_cfg->oper_num_tc; |
@@ -456,9 +456,7 @@ static void i40e_cee_to_dcb_v1_config( | |||
456 | status = (tlv_status & I40E_AQC_CEE_APP_STATUS_MASK) >> | 456 | status = (tlv_status & I40E_AQC_CEE_APP_STATUS_MASK) >> |
457 | I40E_AQC_CEE_APP_STATUS_SHIFT; | 457 | I40E_AQC_CEE_APP_STATUS_SHIFT; |
458 | err = (status & I40E_TLV_STATUS_ERR) ? 1 : 0; | 458 | err = (status & I40E_TLV_STATUS_ERR) ? 1 : 0; |
459 | sync = (status & I40E_TLV_STATUS_SYNC) ? 1 : 0; | 459 | /* Add APPs if Error is False */ |
460 | oper = (status & I40E_TLV_STATUS_OPER) ? 1 : 0; | ||
461 | /* Add APPs if Error is False and Oper/Sync is True */ | ||
462 | if (!err) { | 460 | if (!err) { |
463 | /* CEE operating configuration supports FCoE/iSCSI/FIP only */ | 461 | /* CEE operating configuration supports FCoE/iSCSI/FIP only */ |
464 | dcbcfg->numapps = I40E_CEE_OPER_MAX_APPS; | 462 | dcbcfg->numapps = I40E_CEE_OPER_MAX_APPS; |
diff --git a/drivers/net/ethernet/intel/i40e/i40e_nvm.c b/drivers/net/ethernet/intel/i40e/i40e_nvm.c index e49acd2accd3..554e49d02683 100644 --- a/drivers/net/ethernet/intel/i40e/i40e_nvm.c +++ b/drivers/net/ethernet/intel/i40e/i40e_nvm.c | |||
@@ -821,13 +821,12 @@ static enum i40e_nvmupd_cmd i40e_nvmupd_validate_command(struct i40e_hw *hw, | |||
821 | int *errno) | 821 | int *errno) |
822 | { | 822 | { |
823 | enum i40e_nvmupd_cmd upd_cmd; | 823 | enum i40e_nvmupd_cmd upd_cmd; |
824 | u8 transaction, module; | 824 | u8 transaction; |
825 | 825 | ||
826 | /* anything that doesn't match a recognized case is an error */ | 826 | /* anything that doesn't match a recognized case is an error */ |
827 | upd_cmd = I40E_NVMUPD_INVALID; | 827 | upd_cmd = I40E_NVMUPD_INVALID; |
828 | 828 | ||
829 | transaction = i40e_nvmupd_get_transaction(cmd->config); | 829 | transaction = i40e_nvmupd_get_transaction(cmd->config); |
830 | module = i40e_nvmupd_get_module(cmd->config); | ||
831 | 830 | ||
832 | /* limits on data size */ | 831 | /* limits on data size */ |
833 | if ((cmd->data_size < 1) || | 832 | if ((cmd->data_size < 1) || |