From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
To: davem@davemloft.net
Cc: Carolyn Wyborny <carolyn.wyborny@intel.com>,
netdev@vger.kernel.org, gospo@redhat.com, sassmann@redhat.com,
Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Subject: [net-next v2 04/13] igb: Cleanups to fix assignment in if error
Date: Thu, 24 Apr 2014 18:02:54 -0700 [thread overview]
Message-ID: <1398387783-30414-5-git-send-email-jeffrey.t.kirsher@intel.com> (raw)
In-Reply-To: <1398387783-30414-1-git-send-email-jeffrey.t.kirsher@intel.com>
From: Carolyn Wyborny <carolyn.wyborny@intel.com>
This patch fixes ERROR:ASSIGN_IN_IF found with checkpatch file check.
Signed-off-by: Carolyn Wyborny <carolyn.wyborny@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/igb/igb_main.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 299ac14..6469f97 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -4056,7 +4056,8 @@ static void igb_check_wvbr(struct igb_adapter *adapter)
switch (hw->mac.type) {
case e1000_82576:
case e1000_i350:
- if (!(wvbr = rd32(E1000_WVBR)))
+ wvbr = rd32(E1000_WVBR);
+ if (!wvbr)
return;
break;
default:
--
1.9.0
next prev parent reply other threads:[~2014-04-25 1:03 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-25 1:02 [net-next v2 00/13][pull request] Intel Wired LAN Driver Updates Jeff Kirsher
2014-04-25 1:02 ` [net-next v2 01/13] igb: Cleanups to fix pointer location error Jeff Kirsher
2014-04-25 1:02 ` [net-next v2 02/13] igb: Cleanups to fix for trailing statement Jeff Kirsher
2014-04-25 1:02 ` [net-next v2 03/13] igb: Cleanups to change comment style on license headers Jeff Kirsher
2014-04-25 1:02 ` Jeff Kirsher [this message]
2014-04-25 1:02 ` [net-next v2 05/13] igb: Cleanups to fix missing break in switch statements Jeff Kirsher
2014-04-25 1:02 ` [net-next v2 06/13] igb: Cleanups to remove return parentheses Jeff Kirsher
2014-04-25 1:02 ` [net-next v2 07/13] igb: Cleanups to fix line length warnings Jeff Kirsher
2014-04-25 1:02 ` [net-next v2 08/13] igb: Cleanups to fix msleep warnings Jeff Kirsher
2014-04-25 1:02 ` [net-next v2 09/13] igb: Cleanups to fix static initialization Jeff Kirsher
2014-04-25 1:03 ` [net-next v2 10/13] igb: Cleanups to replace deprecated DEFINE_PCI_DEVICE_TABLE Jeff Kirsher
2014-04-25 1:03 ` [net-next v2 11/13] igb: Cleanups to remove unneeded extern declaration Jeff Kirsher
2014-04-25 1:03 ` [net-next v2 12/13] igb: Replace 1/0 return values with true/false Jeff Kirsher
2014-04-25 1:03 ` [net-next v2 13/13] igb: Change memcpy to struct assignment Jeff Kirsher
2014-04-26 16:55 ` [net-next v2 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=1398387783-30414-5-git-send-email-jeffrey.t.kirsher@intel.com \
--to=jeffrey.t.kirsher@intel.com \
--cc=carolyn.wyborny@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).