From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Jean Sacren <sakiwit@gmail.com>,
netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 05/13] ixgbe: fix ixgbe_check_reset_blocked() declaration
Date: Mon, 31 Mar 2014 16:34:51 -0700 [thread overview]
Message-ID: <1396308899-20926-6-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1396308899-20926-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Jean Sacren <sakiwit@gmail.com>
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>
Acked-by: Don Skidmore <donald.c.skidmore@intel.com>
Tested-by: Phil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@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 ad51c12..23f7652 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c
@@ -107,7 +107,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 4a456c9..0bb047f 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_phy.h
@@ -128,7 +128,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,
--
1.9.0
next prev parent reply other threads:[~2014-03-31 23:36 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-31 23:34 [net-next 00/13][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2014-03-31 23:34 ` [net-next 01/13] e1000e: Fix no connectivity when driver loaded with cable out Jeff Kirsher
2014-04-01 12:06 ` Sergei Shtylyov
2014-04-01 12:30 ` Fabio Estevam
2014-04-01 16:07 ` Thomas Gleixner
2014-04-18 13:15 ` Ben Hutchings
2014-04-18 15:27 ` Ertman, DavidX M
2014-03-31 23:34 ` [net-next 02/13] ixgbe: remove redundant if clause from PTP work Jeff Kirsher
2014-03-31 23:34 ` [net-next 03/13] ixgbe: never generate both software and hardware timestamps Jeff Kirsher
2014-03-31 23:34 ` [net-next 04/13] ixgbe: fix race conditions on queuing skb for HW time stamp Jeff Kirsher
2014-03-31 23:34 ` Jeff Kirsher [this message]
2014-03-31 23:34 ` [net-next 06/13] ixgbevf: Change ixgbe_read_reg to ixgbevf_read_reg Jeff Kirsher
2014-03-31 23:34 ` [net-next 07/13] i40e: fix function kernel doc description Jeff Kirsher
2014-03-31 23:34 ` [net-next 08/13] i40e/i40evf: fix error checking path Jeff Kirsher
2014-04-01 12:14 ` Sergei Shtylyov
2014-03-31 23:34 ` [net-next 09/13] i40e/i40evf: Remove addressof casts to same type Jeff Kirsher
2014-03-31 23:34 ` [net-next 10/13] i40e: Remove casts of pointer " Jeff Kirsher
2014-03-31 23:34 ` [net-next 11/13] INTEL-IGB: Convert iounmap to pci_iounmap Jeff Kirsher
2014-03-31 23:34 ` [net-next 12/13] ixgbe: Fix rcu warnings induced by LER Jeff Kirsher
2014-03-31 23:34 ` [net-next 13/13] ixgbevf: " Jeff Kirsher
2014-04-01 1:19 ` [net-next 00/13][pull request] Intel Wired LAN Driver Updates David Miller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1396308899-20926-6-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=davem@davemloft.net \
--cc=gospo@redhat.com \
--cc=netdev@vger.kernel.org \
--cc=sakiwit@gmail.com \
--cc=sassmann@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).