From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Bruce Allan <bruce.w.allan@intel.com>,
netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next 07/11] e1000e: cleanup: group OR'ed bit settings with parens
Date: Thu, 31 Jan 2013 23:53:27 -0800 [thread overview]
Message-ID: <1359705211-11342-8-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1359705211-11342-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Bruce Allan <bruce.w.allan@intel.com>
For clarity, wrap OR'ed bit settings with parentheses.
Signed-off-by: Bruce Allan <bruce.w.allan@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/e1000e/phy.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000e/phy.c b/drivers/net/ethernet/intel/e1000e/phy.c
index cddfc6b..8dd1da0 100644
--- a/drivers/net/ethernet/intel/e1000e/phy.c
+++ b/drivers/net/ethernet/intel/e1000e/phy.c
@@ -3106,8 +3106,9 @@ s32 e1000_link_stall_workaround_hv(struct e1000_hw *hw)
msleep(200);
/* flush the packets in the fifo buffer */
- ret_val = e1e_wphy(hw, HV_MUX_DATA_CTRL, HV_MUX_DATA_CTRL_GEN_TO_MAC |
- HV_MUX_DATA_CTRL_FORCE_SPEED);
+ ret_val = e1e_wphy(hw, HV_MUX_DATA_CTRL,
+ (HV_MUX_DATA_CTRL_GEN_TO_MAC |
+ HV_MUX_DATA_CTRL_FORCE_SPEED));
if (ret_val)
return ret_val;
--
1.7.11.7
next prev parent reply other threads:[~2013-02-01 7:54 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-01 7:53 [net-next v2 00/11][pull request] Intel Wired LAN Driver Updates 2013.01.31 Jeff Kirsher
2013-02-01 7:53 ` [net-next 01/11] ixgbe: Reset the NIC if up2tc has changed Jeff Kirsher
2013-02-01 8:02 ` Joe Perches
2013-02-01 7:53 ` [net-next 02/11] ixgbe: Fix device ref count bug Jeff Kirsher
2013-02-01 7:53 ` [net-next 03/11] ixgbe: rename autoneg variables Jeff Kirsher
2013-02-01 7:53 ` [net-next 04/11] ixgbe: removed unused variable from setup_link_speed Jeff Kirsher
2013-02-01 7:53 ` [net-next 05/11] ixgbe: autoneg variable refactoring Jeff Kirsher
2013-02-01 7:53 ` [net-next 06/11] e1000e: cleanup defines.h Jeff Kirsher
2013-02-01 7:53 ` Jeff Kirsher [this message]
2013-02-01 7:53 ` [net-next 08/11] e1000e: cleanup some whitespace and indentation issues Jeff Kirsher
2013-02-01 7:53 ` [net-next 09/11] e1000e: update driver version string Jeff Kirsher
2013-02-01 7:53 ` [net-next 10/11] e1000e: resolve -Wunused-parameter compile warnings Jeff Kirsher
2013-02-01 7:53 ` [net-next 11/11] e1000e: use generic IEEE MII definitions Jeff Kirsher
2013-02-03 3:55 ` [net-next v2 00/11][pull request] Intel Wired LAN Driver Updates 2013.01.31 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=1359705211-11342-8-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=bruce.w.allan@intel.com \
--cc=davem@davemloft.net \
--cc=gospo@redhat.com \
--cc=netdev@vger.kernel.org \
--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).