From: Scott Schafer <schaferjscott@gmail.com>
To: gregkh@linuxfoundation.org
Cc: Scott Schafer <schaferjscott@gmail.com>,
Manish Chopra <manishc@marvell.com>,
GR-Linux-NIC-Dev@marvell.com, netdev@vger.kernel.org,
devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2 21/23] staging: qlge: Fix WARNING: suspect code indent for conditional statements
Date: Wed, 11 Dec 2019 12:12:50 -0600 [thread overview]
Message-ID: <323c4dfd64eef1ca15404e45d69ae260ee3e87f4.1576086080.git.schaferjscott@gmail.com> (raw)
In-Reply-To: <cover.1576086080.git.schaferjscott@gmail.com>
Fix indentation for conditionals in qlge_ethtool.c and qlge_main.c
Signed-off-by: Scott Schafer <schaferjscott@gmail.com>
---
drivers/staging/qlge/qlge_ethtool.c | 4 ++--
drivers/staging/qlge/qlge_main.c | 18 +++++++++---------
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/staging/qlge/qlge_ethtool.c b/drivers/staging/qlge/qlge_ethtool.c
index abed932c3694..0bb70b465389 100644
--- a/drivers/staging/qlge/qlge_ethtool.c
+++ b/drivers/staging/qlge/qlge_ethtool.c
@@ -529,8 +529,8 @@ void ql_check_lb_frame(struct ql_adapter *qdev,
if ((*(skb->data + 3) == 0xFF) &&
(*(skb->data + frame_size / 2 + 10) == 0xBE) &&
(*(skb->data + frame_size / 2 + 12) == 0xAF)) {
- atomic_dec(&qdev->lb_count);
- return;
+ atomic_dec(&qdev->lb_count);
+ return;
}
}
diff --git a/drivers/staging/qlge/qlge_main.c b/drivers/staging/qlge/qlge_main.c
index 9427386e4a1e..102da1fe9899 100644
--- a/drivers/staging/qlge/qlge_main.c
+++ b/drivers/staging/qlge/qlge_main.c
@@ -4121,11 +4121,11 @@ static struct net_device_stats *qlge_get_stats(struct net_device
/* Get RX stats. */
pkts = mcast = dropped = errors = bytes = 0;
for (i = 0; i < qdev->rss_ring_count; i++, rx_ring++) {
- pkts += rx_ring->rx_packets;
- bytes += rx_ring->rx_bytes;
- dropped += rx_ring->rx_dropped;
- errors += rx_ring->rx_errors;
- mcast += rx_ring->rx_multicast;
+ pkts += rx_ring->rx_packets;
+ bytes += rx_ring->rx_bytes;
+ dropped += rx_ring->rx_dropped;
+ errors += rx_ring->rx_errors;
+ mcast += rx_ring->rx_multicast;
}
ndev->stats.rx_packets = pkts;
ndev->stats.rx_bytes = bytes;
@@ -4136,9 +4136,9 @@ static struct net_device_stats *qlge_get_stats(struct net_device
/* Get TX stats. */
pkts = errors = bytes = 0;
for (i = 0; i < qdev->tx_ring_count; i++, tx_ring++) {
- pkts += tx_ring->tx_packets;
- bytes += tx_ring->tx_bytes;
- errors += tx_ring->tx_errors;
+ pkts += tx_ring->tx_packets;
+ bytes += tx_ring->tx_bytes;
+ errors += tx_ring->tx_errors;
}
ndev->stats.tx_packets = pkts;
ndev->stats.tx_bytes = bytes;
@@ -4432,7 +4432,7 @@ static int ql_init_device(struct pci_dev *pdev, struct net_device *ndev,
} else {
err = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));
if (!err)
- err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
+ err = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));
}
if (err) {
--
2.20.1
next prev parent reply other threads:[~2019-12-11 18:15 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-11 18:12 [PATCH v2 00/23] V2: Break up from one patch to multiple Scott Schafer
2019-12-11 18:12 ` [PATCH v2 01/23] staging: qlge: Fix CHECK extra blank lines in many files Scott Schafer
2019-12-11 18:12 ` [PATCH v2 02/23] staging: qlge: Fix CHECK: Alignment should match open parenthesis Scott Schafer
2019-12-11 18:12 ` [PATCH v2 03/23] staging:qlge: Fix WARNING: Missing a blank line after declarations Scott Schafer
2019-12-17 12:36 ` [PATCH v2 03/23] staging: qlge: " Greg KH
2019-12-11 18:12 ` [PATCH v2 04/23] " Scott Schafer
2019-12-17 12:37 ` Greg KH
2019-12-11 18:12 ` [PATCH v2 05/23] staging: qlge: Fix CHECK: Blank lines aren't necessary before a close brace '}' Scott Schafer
2019-12-11 18:12 ` [PATCH v2 06/23] staging: qlge: Fix CHECK: Blank lines aren't necessary after an open brace '{' Scott Schafer
2019-12-11 18:12 ` [PATCH v2 07/23] staging: qlge: Fix WARNING: quoted string split across lines Scott Schafer
2019-12-11 18:12 ` [PATCH v2 08/23] staging: qlge: Fix CHECK: Unnecessary parentheses around mpi_coredump->mpi_global_header Scott Schafer
2019-12-11 18:12 ` [PATCH v2 09/23] staging: qlge: Fix CHECK: No space is necessary after a cast Scott Schafer
2019-12-11 18:12 ` [PATCH v2 10/23] staging: qlge: Fix CHECK: blank line after function/struct/union/enum declarations Scott Schafer
2019-12-11 18:12 ` [PATCH v2 11/23] staging: qlge: Fix CHECK: braces {} should be used on all arms of this statement Scott Schafer
2019-12-12 12:12 ` Dan Carpenter
2019-12-12 15:02 ` Scott Schafer
2019-12-12 16:03 ` Greg KH
2019-12-12 16:31 ` Dan Carpenter
2019-12-12 19:25 ` David Miller
2019-12-11 18:12 ` [PATCH v2 12/23] staging: qlge: Fix WARNING: please, no space before tabs in qlge.h Scott Schafer
2019-12-11 18:12 ` [PATCH v2 13/23] staging: qlge: Fix CHECK: spaces preferred around that (ctx:VxV) Scott Schafer
2019-12-11 18:12 ` [PATCH v2 14/23] staging: qlge: Fix WARNING: Unnecessary space before function pointer arguments Scott Schafer
2019-12-11 18:12 ` [PATCH v2 15/23] staging: qlge: Fix WARNING: please, no spaces at the start of a line Scott Schafer
2019-12-11 18:12 ` [PATCH v2 16/23] staging: qlge: Fix WARNING: Block comments use a trailing */ on a separate line Scott Schafer
2019-12-11 18:12 ` [PATCH v2 17/23] staging: qlge: Fix WARNING: else is not generally useful after a break or return Scott Schafer
2019-12-11 18:12 ` [PATCH v2 18/23] staging: qlge: Fix CHECK: Prefer using the BIT macro Scott Schafer
2019-12-11 18:12 ` [PATCH v2 19/23] staging: qlge: Fix WARNING: msleep < 20ms can sleep for up to 20ms Scott Schafer
2019-12-11 18:12 ` [PATCH v2 20/23] staging: qlge: Fix CHECK: usleep_range is preferred over udelay Scott Schafer
2019-12-12 10:45 ` Sergei Shtylyov
2019-12-12 11:00 ` Scott Schafer
2019-12-12 11:12 ` Dan Carpenter
2019-12-12 11:07 ` Dan Carpenter
2019-12-11 18:12 ` Scott Schafer [this message]
2019-12-11 18:12 ` [PATCH v2 22/23] staging: qlge: Fix CHECK: Unbalanced braces around else statement Scott Schafer
2019-12-11 18:12 ` [PATCH v2 23/23] staging: qlge: Fix WARNING: Avoid multiple line dereference Scott Schafer
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=323c4dfd64eef1ca15404e45d69ae260ee3e87f4.1576086080.git.schaferjscott@gmail.com \
--to=schaferjscott@gmail.com \
--cc=GR-Linux-NIC-Dev@marvell.com \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=manishc@marvell.com \
--cc=netdev@vger.kernel.org \
/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).