igb: random code and comments fix

This patch fixes code and comments as identified in the driver.

Signed-off-by: Akeem G Abodunrin <akeem.g.abodunrin@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

diff --git a/drivers/net/ethernet/intel/igb/e1000_i210.c b/drivers/net/ethernet/intel/igb/e1000_i210.c
index 6a42344f24f1805ed6b3e2fe1c4afa98cb1534cf..7caa62b7d45a97b401825b112dfd16a60c25994f 100644 (file)
--- a/drivers/net/ethernet/intel/igb/e1000_i210.c
+++ b/drivers/net/ethernet/intel/igb/e1000_i210.c
@@ -326,7 +326,7 @@ s32 igb_write_nvm_srwr_i210(struct e1000_hw *hw, u16 offset, u16 words,
 /**
  *  igb_read_nvm_i211 - Read NVM wrapper function for I211
  *  @hw: pointer to the HW structure
- *  @address: the word address (aka eeprom offset) to read
+ *  @words: number of words to read
  *  @data: pointer to the data read
  *
  *  Wrapper function to return data formerly found in the NVM.

diff --git a/drivers/net/ethernet/intel/igb/e1000_mac.c b/drivers/net/ethernet/intel/igb/e1000_mac.c
index a5c7200b9a71b8637a31de1c74fcfa6eb48018d3..5d407f46a21b46d1fbbf50f0ab3742237758f2c8 100644 (file)
--- a/drivers/net/ethernet/intel/igb/e1000_mac.c
+++ b/drivers/net/ethernet/intel/igb/e1000_mac.c
@@ -1007,9 +1007,9 @@ s32 igb_config_fc_after_link_up(struct e1000_hw *hw)
                 * be asked to delay transmission of packets than asking
                 * our link partner to pause transmission of frames.
                 */
-               else if ((hw->fc.requested_mode == e1000_fc_none ||
-                         hw->fc.requested_mode == e1000_fc_tx_pause) ||
-                        hw->fc.strict_ieee) {
+               else if ((hw->fc.requested_mode == e1000_fc_none) ||
+                        (hw->fc.requested_mode == e1000_fc_tx_pause) ||
+                        (hw->fc.strict_ieee)) {
                        hw->fc.current_mode = e1000_fc_none;
                        hw_dbg("Flow Control = NONE.\r\n");
                } else {

diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 0a465ae1cdfa334d6c8d1000d01f084f7d00b787..7f83bb1e21fc8685d05f2ae059edd55ccae29324 100644 (file)
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -3859,9 +3859,8 @@ static bool igb_thermal_sensor_event(struct e1000_hw *hw, u32 event)
                ctrl_ext = rd32(E1000_CTRL_EXT);
 
                if ((hw->phy.media_type == e1000_media_type_copper) &&
-                   !(ctrl_ext & E1000_CTRL_EXT_LINK_MODE_SGMII)) {
+                   !(ctrl_ext & E1000_CTRL_EXT_LINK_MODE_SGMII))
                        ret = !!(thstat & event);
-               }
        }
 
        return ret;