Skip to contentSkip to conversation

ixgbe: fix ixgbe_check_reset_blocked() declaration

PATCH In review Jean Sacren 4 participants 4 messages Mar 10, 2014

Subsystems (3)
Networking Network drivers Intel Ethernet
lore
Share & tools
lore

Jean Sacren

author
#0 lore raw

PATCH 1/1 ixgbe: fix ixgbe_check_reset_blocked() declaration

The commit c97506ab0e22 ("ixgbe: Add check for FW veto bit") introduced the new function ixgbe_check_reset_blocked() with a minor issue in declaration. Fix the declaration by changing the type specifier to bool as the definition returns a boolean value. Additionally all ixgbe_check_reset_blocked() callers are expected to return a boolean value.

Signed-off-by Jean Sacren <[email protected]>
Cc Don Skidmore <[email protected]>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 2 +-
 drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c +1 -1
index d2caae4750e0..05e083c99000 100644
@@ -106,7 +106,7 @@ s32 ixgbe_identify_phy_generic(struct ixgbe_hw *hw)
  * have this bit just return false since the link can not be blocked
  * via this method.
  **/
-s32 ixgbe_check_reset_blocked(struct ixgbe_hw *hw)
+bool ixgbe_check_reset_blocked(struct ixgbe_hw *hw)
 {
 	u32 mmngc;
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h +1 -1
index b4d4323666b8..52a9254c34bc 100644
@@ -131,7 +131,7 @@ s32 ixgbe_setup_phy_link_speed_generic(struct ixgbe_hw *hw,
 s32 ixgbe_get_copper_link_capabilities_generic(struct ixgbe_hw *hw,
                                                ixgbe_link_speed *speed,
                                                bool *autoneg);
-s32 ixgbe_check_reset_blocked(struct ixgbe_hw *hw);
+bool ixgbe_check_reset_blocked(struct ixgbe_hw *hw);
 
 /* PHY specific */
 s32 ixgbe_check_phy_link_tnx(struct ixgbe_hw *hw,
Acked-by on v1 1/1
#1 lore raw
Quoted 51 lines

-----Original Message-----
From: Jean Sacren [mailto:[email protected]]
Sent: Sunday, March 09, 2014 6:19 PM
To: Brown, Aaron F
Cc: [email protected]; Skidmore, Donald C
Subject: [PATCH net-next] ixgbe: fix ixgbe_check_reset_blocked() declaration

The commit c97506ab0e22 ("ixgbe: Add check for FW veto bit") introduced the new function ixgbe_check_reset_blocked() with a minor issue in declaration. Fix the declaration by changing the type specifier to bool as the definition returns a boolean value.
Additionally all ixgbe_check_reset_blocked() callers are expected to return a boolean value.

Signed-off-by Jean Sacren <[email protected]>
Cc Don Skidmore <[email protected]>
---
 drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 2 +-
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c +1 -1
index d2caae4750e0..05e083c99000 100644
@@ -106,7 +106,7 @@ s32 ixgbe_identify_phy_generic(struct ixgbe_hw
 *hw)
  * have this bit just return false since the link can not be blocked
  * via this method.
  **/
-s32 ixgbe_check_reset_blocked(struct ixgbe_hw *hw)
+bool ixgbe_check_reset_blocked(struct ixgbe_hw *hw)
 {
 	u32 mmngc;
drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h +1 -1
index b4d4323666b8..52a9254c34bc 100644
@@ -131,7 +131,7 @@ s32 ixgbe_setup_phy_link_speed_generic(struct
 ixgbe_hw *hw,
 s32 ixgbe_get_copper_link_capabilities_generic(struct ixgbe_hw *hw,
                                                ixgbe_link_speed *speed,
                                                bool *autoneg);
-s32 ixgbe_check_reset_blocked(struct ixgbe_hw *hw);
+bool ixgbe_check_reset_blocked(struct ixgbe_hw *hw);
 
 /* PHY specific */
Quoted 1 line

s32 ixgbe_check_phy_link_tnx(struct ixgbe_hw *hw,

This was an over look on my part. Thanks for the patch. :)

Acked-by Don Skidmore <[email protected]>
maintainer
#2 lore raw
In reply to Jean Sacren

From: Jean Sacren <[email protected]>
Date: Sun, 9 Mar 2014 19:19:02 -0600

Quoted 9 lines

The commit c97506ab0e22 ("ixgbe: Add check for FW veto bit") introduced the new function ixgbe_check_reset_blocked() with a minor issue in declaration. Fix the declaration by changing the type specifier to bool as the definition returns a boolean value. Additionally all ixgbe_check_reset_blocked() callers are expected to return a boolean value.

Signed-off-by Jean Sacren <[email protected]>
Cc Don Skidmore <[email protected]>

I assume Jeff will pick this up into his Intel tree.

#3 lore raw
Quoted 19 lines

-----Original Message-----
From: David Miller [mailto:[email protected]]
Sent: Monday, March 10, 2014 13:28
To: [email protected]
Cc: Brown, Aaron F; [email protected]; Skidmore, Donald C; Kirsher, Jeffrey T
Subject: Re: [PATCH net-next] ixgbe: fix ixgbe_check_reset_blocked() declaration

From: Jean Sacren <[email protected]>
Date: Sun, 9 Mar 2014 19:19:02 -0600

Quoted 7 lines

The commit c97506ab0e22 ("ixgbe: Add check for FW veto bit") introduced the new function ixgbe_check_reset_blocked() with a minor issue in declaration. Fix the declaration by changing the type specifier to bool as the definition returns a boolean value. Additionally all ixgbe_check_reset_blocked() callers are expected to return a boolean value.

Quoted 4 lines
Quoted 2 lines
Signed-off-by Jean Sacren <[email protected]>
Cc Don Skidmore <[email protected]>

I assume Jeff will pick this up into his Intel tree.

[Kirsher, Jeffrey T]

Yes, I will pick it up. Sorry for the delayed response.