From: Dima Ruinskiy <[email protected]>
Fix whitespace and tab inconsistencies.
Fixes: a3358d942fa9 ("net/e1000/base: enable new I219 devices")
Fixes: bdca22d62ff0 ("net/e1000/base: add PHY read/write retry mechanism")
Signed-off-by: Dima Ruinskiy <[email protected]>
Signed-off-by: Ciara Loftus <[email protected]>
---
drivers/net/intel/e1000/base/e1000_ich8lan.c | 6 +++---
drivers/net/intel/e1000/base/e1000_phy.c | 5 ++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/drivers/net/intel/e1000/base/e1000_ich8lan.c
b/drivers/net/intel/e1000/base/e1000_ich8lan.c
index 96b9ad6a70..e62847fb4e 100644
--- a/drivers/net/intel/e1000/base/e1000_ich8lan.c
+++ b/drivers/net/intel/e1000/base/e1000_ich8lan.c
@@ -4178,7 +4178,7 @@ STATIC s32 e1000_update_nvm_checksum_spt(struct e1000_hw
*hw)
usec_delay(100);
- /* Write the data to the new bank. Offset in words*/
+ /* Write the data to the new bank. Offset in words */
act_offset = i + new_bank_offset;
ret_val = e1000_retry_write_flash_dword_ich8lan(hw, act_offset,
dword);
@@ -4201,7 +4201,7 @@ STATIC s32 e1000_update_nvm_checksum_spt(struct e1000_hw
*hw)
*/
act_offset = new_bank_offset + E1000_ICH_NVM_SIG_WORD;
- /*offset in words but we read dword*/
+ /* offset in words but we read dword */
--act_offset;
ret_val = e1000_read_flash_dword_ich8lan(hw, act_offset, &dword);
@@ -4214,7 +4214,7 @@ STATIC s32 e1000_update_nvm_checksum_spt(struct e1000_hw
*hw)
if (ret_val)
goto release;
- /* offset in words but we read dword*/
+ /* offset in words but we read dword */
act_offset = old_bank_offset + E1000_ICH_NVM_SIG_WORD - 1;
ret_val = e1000_read_flash_dword_ich8lan(hw, act_offset, &dword);
diff --git a/drivers/net/intel/e1000/base/e1000_phy.c
b/drivers/net/intel/e1000/base/e1000_phy.c
index b449c6ef42..31ef5089ba 100644
--- a/drivers/net/intel/e1000/base/e1000_phy.c
+++ b/drivers/net/intel/e1000/base/e1000_phy.c
@@ -253,7 +253,7 @@ s32 e1000_phy_reset_dsp_generic(struct e1000_hw *hw)
return hw->phy.ops.write_reg(hw, M88E1000_PHY_GEN_CONTROL, 0);
}
-void e1000_disable_phy_retry_mechanism(struct e1000_hw* hw, u32*
phy_retries_original)
+void e1000_disable_phy_retry_mechanism(struct e1000_hw *hw, u32
*phy_retries_original)
{
DEBUGFUNC("e1000_disable_phy_retry_mechanism");
@@ -262,7 +262,7 @@ void e1000_disable_phy_retry_mechanism(struct e1000_hw* hw,
u32* phy_retries_ori
hw->phy.current_retry_counter = 0;
}
-void e1000_enable_phy_retry_mechanism(struct e1000_hw* hw, u32
phy_retries_original)
+void e1000_enable_phy_retry_mechanism(struct e1000_hw *hw, u32
phy_retries_original)
{
DEBUGFUNC("e1000_enable_phy_retry_mechanism");
@@ -346,7 +346,6 @@ s32 e1000_read_phy_reg_mdic(struct e1000_hw *hw, u32
offset, u16 *data)
}
}
-
return -E1000_ERR_PHY;
}
--
2.43.0
