diff options
Diffstat (limited to 'drivers/net/e1000e/ich8lan.c')
-rw-r--r-- | drivers/net/e1000e/ich8lan.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/net/e1000e/ich8lan.c b/drivers/net/e1000e/ich8lan.c index 10360fb596aa..b2507d93de99 100644 --- a/drivers/net/e1000e/ich8lan.c +++ b/drivers/net/e1000e/ich8lan.c | |||
@@ -690,8 +690,6 @@ static s32 e1000_acquire_nvm_ich8lan(struct e1000_hw *hw) | |||
690 | static void e1000_release_nvm_ich8lan(struct e1000_hw *hw) | 690 | static void e1000_release_nvm_ich8lan(struct e1000_hw *hw) |
691 | { | 691 | { |
692 | mutex_unlock(&nvm_mutex); | 692 | mutex_unlock(&nvm_mutex); |
693 | |||
694 | return; | ||
695 | } | 693 | } |
696 | 694 | ||
697 | static DEFINE_MUTEX(swflag_mutex); | 695 | static DEFINE_MUTEX(swflag_mutex); |
@@ -770,8 +768,6 @@ static void e1000_release_swflag_ich8lan(struct e1000_hw *hw) | |||
770 | ew32(EXTCNF_CTRL, extcnf_ctrl); | 768 | ew32(EXTCNF_CTRL, extcnf_ctrl); |
771 | 769 | ||
772 | mutex_unlock(&swflag_mutex); | 770 | mutex_unlock(&swflag_mutex); |
773 | |||
774 | return; | ||
775 | } | 771 | } |
776 | 772 | ||
777 | /** | 773 | /** |
@@ -2756,8 +2752,6 @@ static void e1000_initialize_hw_bits_ich8lan(struct e1000_hw *hw) | |||
2756 | reg = er32(RFCTL); | 2752 | reg = er32(RFCTL); |
2757 | reg |= (E1000_RFCTL_NFSW_DIS | E1000_RFCTL_NFSR_DIS); | 2753 | reg |= (E1000_RFCTL_NFSW_DIS | E1000_RFCTL_NFSR_DIS); |
2758 | ew32(RFCTL, reg); | 2754 | ew32(RFCTL, reg); |
2759 | |||
2760 | return; | ||
2761 | } | 2755 | } |
2762 | 2756 | ||
2763 | /** | 2757 | /** |
@@ -3137,8 +3131,6 @@ void e1000e_disable_gig_wol_ich8lan(struct e1000_hw *hw) | |||
3137 | default: | 3131 | default: |
3138 | break; | 3132 | break; |
3139 | } | 3133 | } |
3140 | |||
3141 | return; | ||
3142 | } | 3134 | } |
3143 | 3135 | ||
3144 | /** | 3136 | /** |
@@ -3347,8 +3339,6 @@ static void e1000_power_down_phy_copper_ich8lan(struct e1000_hw *hw) | |||
3347 | if (!(hw->mac.ops.check_mng_mode(hw) || | 3339 | if (!(hw->mac.ops.check_mng_mode(hw) || |
3348 | hw->phy.ops.check_reset_block(hw))) | 3340 | hw->phy.ops.check_reset_block(hw))) |
3349 | e1000_power_down_phy_copper(hw); | 3341 | e1000_power_down_phy_copper(hw); |
3350 | |||
3351 | return; | ||
3352 | } | 3342 | } |
3353 | 3343 | ||
3354 | /** | 3344 | /** |