From: Dorothea Ehrl <dorothea.ehrl@fau.de>
To: manishc@marvell.com, GR-Linux-NIC-Dev@marvell.com,
gregkh@linuxfoundation.org, netdev@vger.kernel.org,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Cc: linux-kernel@i4.cs.fau.de, Dorothea Ehrl <dorothea.ehrl@fau.de>,
Vanessa Hack <vanessa.hack@fau.de>
Subject: [PATCH 3/5] staging/qlge: add braces to conditional statement
Date: Wed, 27 Nov 2019 13:30:50 +0100 [thread overview]
Message-ID: <20191127123052.16424-3-dorothea.ehrl@fau.de> (raw)
In-Reply-To: <20191127123052.16424-1-dorothea.ehrl@fau.de>
This patch fixes "CHECK: braces {} should be used on all arms of this
statement" by checkpatch.pl.
Signed-off-by: Dorothea Ehrl <dorothea.ehrl@fau.de>
Co-developed-by: Vanessa Hack <vanessa.hack@fau.de>
Signed-off-by: Vanessa Hack <vanessa.hack@fau.de>
---
drivers/staging/qlge/qlge_main.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/staging/qlge/qlge_main.c b/drivers/staging/qlge/qlge_main.c
index 587102aa7fbf..f5ab6cc7050a 100644
--- a/drivers/staging/qlge/qlge_main.c
+++ b/drivers/staging/qlge/qlge_main.c
@@ -178,8 +178,9 @@ int ql_wait_reg_rdy(struct ql_adapter *qdev, u32 reg, u32 bit, u32 err_bit)
"register 0x%.08x access error, value = 0x%.08x!.\n",
reg, temp);
return -EIO;
- } else if (temp & bit)
+ } else if (temp & bit) {
return 0;
+ }
udelay(UDELAY_DELAY);
}
netif_alert(qdev, probe, qdev->ndev,
@@ -3731,8 +3732,9 @@ static int ql_adapter_reset(struct ql_adapter *qdev)
/* Wait for the NIC and MGMNT FIFOs to empty. */
ql_wait_fifo_empty(qdev);
- } else
+ } else {
clear_bit(QL_ASIC_RECOVERY, &qdev->flags);
+ }
ql_write32(qdev, RST_FO, (RST_FO_FR << 16) | RST_FO_FR);
--
2.20.1
next prev parent reply other threads:[~2019-11-27 12:40 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-27 12:30 [PATCH 1/5] staging/qlge: remove initialising of static local variable Dorothea Ehrl
2019-11-27 12:30 ` [PATCH 2/5] staging/qlge: add blank lines after declarations Dorothea Ehrl
2019-11-27 12:30 ` Dorothea Ehrl [this message]
2019-11-27 12:30 ` [PATCH 4/5] staging/qlge: remove braces in conditional statement Dorothea Ehrl
2019-11-27 12:30 ` [PATCH 5/5] staging/qlge: fix block comment coding style Dorothea Ehrl
2019-11-29 7:17 ` [i4passt] [PATCH 1/5] staging/qlge: remove initialising of static local variable Tobias Langer
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=20191127123052.16424-3-dorothea.ehrl@fau.de \
--to=dorothea.ehrl@fau.de \
--cc=GR-Linux-NIC-Dev@marvell.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@i4.cs.fau.de \
--cc=linux-kernel@vger.kernel.org \
--cc=manishc@marvell.com \
--cc=netdev@vger.kernel.org \
--cc=vanessa.hack@fau.de \
/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).