Patchwork [net-next,07/13] igb: random code and comments fix

login
register
mail settings
Submitter Jeff Kirsher
Date April 4, 2013, 11:37 a.m.
Message ID <1365075480-20183-8-git-send-email-jeffrey.t.kirsher@intel.com>
Download mbox | patch
Permalink /patch/233730/
State Changes Requested
Delegated to: David Miller
Headers show

Comments

Jeff Kirsher - April 4, 2013, 11:37 a.m.
From: "Akeem G. Abodunrin" <akeem.g.abodunrin@intel.com>

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>
---
 drivers/net/ethernet/intel/igb/e1000_i210.c | 2 +-
 drivers/net/ethernet/intel/igb/e1000_mac.c  | 6 +++---
 drivers/net/ethernet/intel/igb/igb_main.c   | 3 +--
 3 files changed, 5 insertions(+), 6 deletions(-)
Sergei Shtylyov - April 4, 2013, 2:22 p.m.
Hello.

On 04-04-2013 15:37, Jeff Kirsher wrote:

> From: "Akeem G. Abodunrin" <akeem.g.abodunrin@intel.com>

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

   It seems you are doing 3 different things in 3 different files in this 
patch... it would be better to split it up.

> 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_mac.c b/drivers/net/ethernet/intel/igb/e1000_mac.c
> index a5c7200..5d407f4 100644
> --- 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)) {

    The code was alright bnefore this change, so this isn't really a fix at 
all. Aside of that, () around == are not needed, and yet less around 
'hw->fc.strict_ieee'.

> diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
> index fb162ef..8752f4f 100644
> --- 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);
> -		}

    This was checkpatch.pl's message right?

WBR, Sergei

--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/drivers/net/ethernet/intel/igb/e1000_i210.c b/drivers/net/ethernet/intel/igb/e1000_i210.c
index 6a42344..7caa62b 100644
--- 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 a5c7200..5d407f4 100644
--- 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 fb162ef..8752f4f 100644
--- 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;