From: Aaron Conole <aconole@redhat.com>
To: dev@dpdk.org, Bruce Richardson <bruce.richardson@intel.com>,
Thomas Monjalon <thomas.monjalon@6wind.com>,
Helin Zhang <helin.zhang@intel.com>,
Wenzhuo Lu <wenzhou.lu@intel.com>,
Panu Matilainen <pmatilai@redhat.com>,
Remy Horton <remy.horton@intel.com>
Subject: [dpdk-dev] [PATCH v2 2/7] drivers/net/e1000: Fix missing brackets
Date: Tue, 22 Mar 2016 17:37:13 -0400 [thread overview]
Message-ID: <1458682638-28378-3-git-send-email-aconole@redhat.com> (raw)
In-Reply-To: <1458682638-28378-1-git-send-email-aconole@redhat.com>
The register read/write mphy functions have misleading whitespace around
the locked check. This cleanup merely preserves the existing functionality
while improving the ready check.
Fixes commit 38db3f7f50bd ("e1000: update base driver")
Signed-off-by: Aaron Conole <aconole@redhat.com>
---
v2:
* Changed from "whitespace-only" fix to a functional change
moving the phy writes into protection of the `if (locked)`
code
* Added "Fixes" line.
drivers/net/e1000/base/e1000_phy.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/net/e1000/base/e1000_phy.c b/drivers/net/e1000/base/e1000_phy.c
index d43b7ce..ad3fd58 100644
--- a/drivers/net/e1000/base/e1000_phy.c
+++ b/drivers/net/e1000/base/e1000_phy.c
@@ -4153,12 +4153,12 @@ s32 e1000_read_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 *data)
*data = E1000_READ_REG(hw, E1000_MPHY_DATA);
/* Disable access to mPHY if it was originally disabled */
- if (locked)
+ if (locked) {
ready = e1000_is_mphy_ready(hw);
if (!ready)
return -E1000_ERR_PHY;
- E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL,
- E1000_MPHY_DIS_ACCESS);
+ E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, E1000_MPHY_DIS_ACCESS);
+ }
return E1000_SUCCESS;
}
@@ -4218,12 +4218,12 @@ s32 e1000_write_phy_reg_mphy(struct e1000_hw *hw, u32 address, u32 data,
E1000_WRITE_REG(hw, E1000_MPHY_DATA, data);
/* Disable access to mPHY if it was originally disabled */
- if (locked)
+ if (locked) {
ready = e1000_is_mphy_ready(hw);
if (!ready)
return -E1000_ERR_PHY;
- E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL,
- E1000_MPHY_DIS_ACCESS);
+ E1000_WRITE_REG(hw, E1000_MPHY_ADDR_CTRL, E1000_MPHY_DIS_ACCESS);
+ }
return E1000_SUCCESS;
}
--
2.8.0.rc2.35.gc2c5f6b.dirty
next prev parent reply other threads:[~2016-03-22 21:37 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-22 21:37 [dpdk-dev] [PATCH v2 0/7] Various fixes to compile with gcc6 Aaron Conole
2016-03-22 21:37 ` [dpdk-dev] [PATCH v2 1/7] app/test/test: Fix missing brackets Aaron Conole
2016-03-22 21:37 ` Aaron Conole [this message]
2016-03-23 10:38 ` [dpdk-dev] [PATCH v2 2/7] drivers/net/e1000: " Thomas Monjalon
2016-03-23 10:41 ` Thomas Monjalon
2016-03-24 0:35 ` Lu, Wenzhuo
2016-03-24 6:54 ` Panu Matilainen
2016-03-30 10:51 ` Thomas Monjalon
2016-03-30 13:14 ` Aaron Conole
2016-03-30 14:06 ` [dpdk-dev] [PATCH v3 2/7] drivers/net/e1000: Suppress misleading indentation warning Aaron Conole
2016-03-30 16:36 ` Stephen Hemminger
2016-03-30 17:12 ` Thomas Monjalon
2016-03-30 21:48 ` Stephen Hemminger
2016-03-31 0:41 ` Lu, Wenzhuo
2016-03-22 21:37 ` [dpdk-dev] [PATCH v2 3/7] drivers/net/e1000: Fix missing lsc interrupt check brackets Aaron Conole
2016-03-22 21:37 ` [dpdk-dev] [PATCH v2 4/7] drivers/net/ixgbe: Fix vlan filter missing brackets Aaron Conole
2016-03-22 21:37 ` [dpdk-dev] [PATCH v2 5/7] drivers/net/e1000/igb: Signed left shift operator Aaron Conole
2016-03-22 21:37 ` [dpdk-dev] [PATCH v2 6/7] drivers/net/ixgbe: " Aaron Conole
2016-03-22 21:37 ` [dpdk-dev] [PATCH v2 7/7] drivers/net/ixgbe: Fix uninitialized warning Aaron Conole
2016-03-31 15:02 ` [dpdk-dev] [PATCH v2 0/7] Various fixes to compile with gcc6 Thomas Monjalon
2016-04-01 6:07 ` Panu Matilainen
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=1458682638-28378-3-git-send-email-aconole@redhat.com \
--to=aconole@redhat.com \
--cc=bruce.richardson@intel.com \
--cc=dev@dpdk.org \
--cc=helin.zhang@intel.com \
--cc=pmatilai@redhat.com \
--cc=remy.horton@intel.com \
--cc=thomas.monjalon@6wind.com \
--cc=wenzhou.lu@intel.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).