diff mbox

[net-next] ixgbe: fix ixgbe_check_reset_blocked() declaration

Message ID 1394414342-2482-1-git-send-email-sakiwit@gmail.com
State Awaiting Upstream, archived
Delegated to: David Miller
Headers show

Commit Message

Jεan Sacren March 10, 2014, 1:19 a.m. UTC
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 <sakiwit@gmail.com>
Cc: Don Skidmore <donald.c.skidmore@intel.com>
---
 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(-)

--
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

Comments

Skidmore, Donald C March 10, 2014, 6:26 p.m. UTC | #1
> -----Original Message-----
> From: Jean Sacren [mailto:sakiwit@gmail.com]
> Sent: Sunday, March 09, 2014 6:19 PM
> To: Brown, Aaron F
> Cc: netdev@vger.kernel.org; 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 <sakiwit@gmail.com>
> Cc: Don Skidmore <donald.c.skidmore@intel.com>
> ---
>  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(-)
> 
> diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
> b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
> index d2caae4750e0..05e083c99000 100644
> --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
> +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
> @@ -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;
> 
> diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h
> b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h
> index b4d4323666b8..52a9254c34bc 100644
> --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h
> +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h
> @@ -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,

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

Acked-By: Don Skidmore <donald.c.skidmore@intel.com>

--
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
David Miller March 10, 2014, 8:28 p.m. UTC | #2
From: Jean Sacren <sakiwit@gmail.com>
Date: Sun,  9 Mar 2014 19:19:02 -0600

> 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 <sakiwit@gmail.com>
> Cc: Don Skidmore <donald.c.skidmore@intel.com>

I assume Jeff will pick this up into his Intel tree.
--
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
Kirsher, Jeffrey T March 10, 2014, 8:32 p.m. UTC | #3
> -----Original Message-----
> From: David Miller [mailto:davem@davemloft.net]
> Sent: Monday, March 10, 2014 13:28
> To: sakiwit@gmail.com
> Cc: Brown, Aaron F; netdev@vger.kernel.org; Skidmore, Donald C; Kirsher,
> Jeffrey T
> Subject: Re: [PATCH net-next] ixgbe: fix ixgbe_check_reset_blocked()
> declaration
> 
> From: Jean Sacren <sakiwit@gmail.com>
> Date: Sun,  9 Mar 2014 19:19:02 -0600
> 
> > 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 <sakiwit@gmail.com>
> > Cc: Don Skidmore <donald.c.skidmore@intel.com>
> 
> 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.
--
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
diff mbox

Patch

diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
index d2caae4750e0..05e083c99000 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
@@ -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;
 
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h
index b4d4323666b8..52a9254c34bc 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h
@@ -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,