Skip to content

Commit

Permalink
e1000e: remove unnecessary returns from void functions
Browse files Browse the repository at this point in the history 
...and convert some goto's which simply return to just return.

Signed-off-by: Bruce Allan <bruce.w.allan@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
  • Loading branch information
Bruce Allan authored and Jeff Kirsher committed Feb 10, 2012
1 parent 4bcf053 commit fe1e980
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 14 deletions.
3 changes: 0 additions & 3 deletions drivers/net/ethernet/intel/e1000e/ich8lan.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1762,7 +1762,6 @@ static void e1000_gate_hw_phy_config_ich8lan(struct e1000_hw *hw, bool gate)
extcnf_ctrl &= ~E1000_EXTCNF_CTRL_GATE_PHY_CFG;

ew32(EXTCNF_CTRL, extcnf_ctrl);
return;
}

/**
Expand Down Expand Up @@ -3768,8 +3767,6 @@ void e1000_resume_workarounds_pchlan(struct e1000_hw *hw)

release:
hw->phy.ops.release(hw);

return;
}

/**
Expand Down
8 changes: 2 additions & 6 deletions drivers/net/ethernet/intel/e1000e/mac.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1661,7 +1661,7 @@ void e1000e_reset_adaptive(struct e1000_hw *hw)

if (!mac->adaptive_ifs) {
e_dbg("Not in Adaptive IFS mode!\n");
goto out;
return;
}

mac->current_ifs_val = 0;
Expand All @@ -1672,8 +1672,6 @@ void e1000e_reset_adaptive(struct e1000_hw *hw)

mac->in_ifs_mode = false;
ew32(AIT, 0);
out:
return;
}

/**
Expand All @@ -1689,7 +1687,7 @@ void e1000e_update_adaptive(struct e1000_hw *hw)

if (!mac->adaptive_ifs) {
e_dbg("Not in Adaptive IFS mode!\n");
goto out;
return;
}

if ((mac->collision_delta * mac->ifs_ratio) > mac->tx_packet_delta) {
Expand All @@ -1712,6 +1710,4 @@ void e1000e_update_adaptive(struct e1000_hw *hw)
ew32(AIT, 0);
}
}
out:
return;
}
7 changes: 2 additions & 5 deletions drivers/net/ethernet/intel/e1000e/netdev.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ static void e1000e_dump(struct e1000_adapter *adapter)

/* Print Tx Ring Summary */
if (!netdev || !netif_running(netdev))
goto exit;
return;

dev_info(&adapter->pdev->dev, "Tx Ring Summary\n");
pr_info("Queue [NTU] [NTC] [bi(ntc)->dma ] leng ntw timestamp\n");
Expand Down Expand Up @@ -308,7 +308,7 @@ static void e1000e_dump(struct e1000_adapter *adapter)

/* Print Rx Ring */
if (!netif_msg_rx_status(adapter))
goto exit;
return;

dev_info(&adapter->pdev->dev, "Rx Ring Dump\n");
switch (adapter->rx_ps_pages) {
Expand Down Expand Up @@ -449,9 +449,6 @@ static void e1000e_dump(struct e1000_adapter *adapter)
}
}
}

exit:
return;
}

/**
Expand Down

0 comments on commit fe1e980

Please sign in to comment.