p71924506
/
linux_old1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

i40e: remove unused nvm_semaphore_wait 

The nvm_semaphore_wait field is set but never used, so let's
just get rid of it.

Change-ID: I2107bd29b69f99b1a61d7591d087429527c9d8fa
Signed-off-by: Shannon Nelson <shannon.nelson@intel.com>
Acked-by: Michal Kosiarz <michal.kosiarz@intel.com>
Tested-by: Jim Young <jamesx.m.young@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Shannon Nelson 2014-11-13 08:23:18 +00:00 committed by Jeff Kirsher
parent 0f52958b2c
commit 2a6d8c2f01
3 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/net/ethernet/intel/i40e/i40e_nvm.c
View File

@ -116,8 +116,6 @@ i40e_status i40e_acquire_nvm(struct i40e_hw *hw,
} }
if (ret_code) { if (ret_code) {
hw->nvm.hw_semaphore_timeout = 0; hw->nvm.hw_semaphore_timeout = 0;
hw->nvm.hw_semaphore_wait =
I40E_MS_TO_GTIME(time) + gtime;
i40e_debug(hw, I40E_DEBUG_NVM, i40e_debug(hw, I40E_DEBUG_NVM,
"NVM acquire timed out, wait %llu ms before trying again.\n", "NVM acquire timed out, wait %llu ms before trying again.\n",
time); time);

1
drivers/net/ethernet/intel/i40e/i40e_type.h
View File

@ -262,7 +262,6 @@ enum i40e_aq_resource_access_type {
struct i40e_nvm_info { struct i40e_nvm_info {
u64 hw_semaphore_timeout; /* 2usec global time (GTIME resolution) */ u64 hw_semaphore_timeout; /* 2usec global time (GTIME resolution) */
u64 hw_semaphore_wait; /* - || - */
u32 timeout; /* [ms] */ u32 timeout; /* [ms] */
u16 sr_size; /* Shadow RAM size in words */ u16 sr_size; /* Shadow RAM size in words */
bool blank_nvm_mode; /* is NVM empty (no FW present)*/ bool blank_nvm_mode; /* is NVM empty (no FW present)*/

1
drivers/net/ethernet/intel/i40evf/i40e_type.h
View File

@ -261,7 +261,6 @@ enum i40e_aq_resource_access_type {
struct i40e_nvm_info { struct i40e_nvm_info {
u64 hw_semaphore_timeout; /* 2usec global time (GTIME resolution) */ u64 hw_semaphore_timeout; /* 2usec global time (GTIME resolution) */
u64 hw_semaphore_wait; /* - || - */
u32 timeout; /* [ms] */ u32 timeout; /* [ms] */
u16 sr_size; /* Shadow RAM size in words */ u16 sr_size; /* Shadow RAM size in words */
bool blank_nvm_mode; /* is NVM empty (no FW present)*/ bool blank_nvm_mode; /* is NVM empty (no FW present)*/