* [PATCH net-next] ixgbe: fix ixgbe_check_reset_blocked() declaration
@ 2014-03-10 1:19 Jean Sacren
2014-03-10 18:26 ` Skidmore, Donald C
2014-03-10 20:28 ` David Miller
0 siblings, 2 replies; 4+ messages in thread
From: Jean Sacren @ 2014-03-10 1:19 UTC (permalink / raw)
To: Aaron Brown; +Cc: netdev, Don Skidmore
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,
^ permalink raw reply related [flat|nested] 4+ messages in thread* RE: [PATCH net-next] ixgbe: fix ixgbe_check_reset_blocked() declaration
2014-03-10 1:19 [PATCH net-next] ixgbe: fix ixgbe_check_reset_blocked() declaration Jean Sacren
@ 2014-03-10 18:26 ` Skidmore, Donald C
2014-03-10 20:28 ` David Miller
1 sibling, 0 replies; 4+ messages in thread
From: Skidmore, Donald C @ 2014-03-10 18:26 UTC (permalink / raw)
To: Jean Sacren, Brown, Aaron F, Kirsher, Jeffrey T; +Cc: netdev@vger.kernel.org
> -----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>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net-next] ixgbe: fix ixgbe_check_reset_blocked() declaration
2014-03-10 1:19 [PATCH net-next] ixgbe: fix ixgbe_check_reset_blocked() declaration Jean Sacren
2014-03-10 18:26 ` Skidmore, Donald C
@ 2014-03-10 20:28 ` David Miller
2014-03-10 20:32 ` Kirsher, Jeffrey T
1 sibling, 1 reply; 4+ messages in thread
From: David Miller @ 2014-03-10 20:28 UTC (permalink / raw)
To: sakiwit; +Cc: aaron.f.brown, netdev, donald.c.skidmore, jeffrey.t.kirsher
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.
^ permalink raw reply [flat|nested] 4+ messages in thread* RE: [PATCH net-next] ixgbe: fix ixgbe_check_reset_blocked() declaration
2014-03-10 20:28 ` David Miller
@ 2014-03-10 20:32 ` Kirsher, Jeffrey T
0 siblings, 0 replies; 4+ messages in thread
From: Kirsher, Jeffrey T @ 2014-03-10 20:32 UTC (permalink / raw)
To: David Miller, sakiwit@gmail.com
Cc: Brown, Aaron F, netdev@vger.kernel.org, Skidmore, Donald C
> -----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.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2014-03-10 20:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-10 1:19 [PATCH net-next] ixgbe: fix ixgbe_check_reset_blocked() declaration Jean Sacren
2014-03-10 18:26 ` Skidmore, Donald C
2014-03-10 20:28 ` David Miller
2014-03-10 20:32 ` Kirsher, Jeffrey T
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).