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 13/23] staging: qlge: Fix CHECK: spaces preferred around that (ctx:VxV)
Date: Wed, 11 Dec 2019 12:12:42 -0600 [thread overview]
Message-ID: <a6f197d39478dc6955834412e20b4aed7c7141a2.1576086080.git.schaferjscott@gmail.com> (raw)
In-Reply-To: <cover.1576086080.git.schaferjscott@gmail.com>
Fix CHECK: spaces preferred around that (ctx:VxV) in qlge.h and
qlge_main.c
Signed-off-by: Scott Schafer <schaferjscott@gmail.com>
---
drivers/staging/qlge/qlge.h | 6 +++---
drivers/staging/qlge/qlge_main.c | 18 +++++++++---------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/qlge/qlge.h b/drivers/staging/qlge/qlge.h
index 63642cb9e624..9ab4c7ce7714 100644
--- a/drivers/staging/qlge/qlge.h
+++ b/drivers/staging/qlge/qlge.h
@@ -59,7 +59,7 @@
#define MAX_CQ 128
#define DFLT_COALESCE_WAIT 100 /* 100 usec wait for coalescing */
#define MAX_INTER_FRAME_WAIT 10 /* 10 usec max interframe-wait for coalescing */
-#define DFLT_INTER_FRAME_WAIT (MAX_INTER_FRAME_WAIT/2)
+#define DFLT_INTER_FRAME_WAIT (MAX_INTER_FRAME_WAIT / 2)
#define UDELAY_COUNT 3
#define UDELAY_DELAY 100
@@ -1366,7 +1366,7 @@ struct tx_ring_desc {
struct tx_ring_desc *next;
};
-#define QL_TXQ_IDX(qdev, skb) (smp_processor_id()%(qdev->tx_ring_count))
+#define QL_TXQ_IDX(qdev, skb) (smp_processor_id() % (qdev->tx_ring_count))
struct tx_ring {
/*
@@ -1790,7 +1790,7 @@ struct ql_reg_dump {
/* segment 34 */
struct mpi_coredump_segment_header ets_seg_hdr;
- u32 ets[8+2];
+ u32 ets[8 + 2];
};
struct ql_mpi_coredump {
diff --git a/drivers/staging/qlge/qlge_main.c b/drivers/staging/qlge/qlge_main.c
index 4dc4edbb2de5..38d217ae4002 100644
--- a/drivers/staging/qlge/qlge_main.c
+++ b/drivers/staging/qlge/qlge_main.c
@@ -706,7 +706,7 @@ static int ql_get_8000_flash_params(struct ql_adapter *qdev)
size = sizeof(struct flash_params_8000) / sizeof(u32);
for (i = 0; i < size; i++, p++) {
- status = ql_read_flash_word(qdev, i+offset, p);
+ status = ql_read_flash_word(qdev, i + offset, p);
if (status) {
netif_err(qdev, ifup, qdev->ndev,
"Error reading flash.\n");
@@ -769,7 +769,7 @@ static int ql_get_8012_flash_params(struct ql_adapter *qdev)
return -ETIMEDOUT;
for (i = 0; i < size; i++, p++) {
- status = ql_read_flash_word(qdev, i+offset, p);
+ status = ql_read_flash_word(qdev, i + offset, p);
if (status) {
netif_err(qdev, ifup, qdev->ndev,
"Error reading flash.\n");
@@ -1544,7 +1544,7 @@ static void ql_process_mac_rx_page(struct ql_adapter *qdev,
struct iphdr *iph =
(struct iphdr *)((u8 *)addr + hlen);
if (!(iph->frag_off &
- htons(IP_MF|IP_OFFSET))) {
+ htons(IP_MF | IP_OFFSET))) {
skb->ip_summed = CHECKSUM_UNNECESSARY;
netif_printk(qdev, rx_status, KERN_DEBUG,
qdev->ndev,
@@ -1651,7 +1651,7 @@ static void ql_process_mac_rx_skb(struct ql_adapter *qdev,
struct iphdr *iph = (struct iphdr *)skb->data;
if (!(iph->frag_off &
- htons(IP_MF|IP_OFFSET))) {
+ htons(IP_MF | IP_OFFSET))) {
skb->ip_summed = CHECKSUM_UNNECESSARY;
netif_printk(qdev, rx_status, KERN_DEBUG,
qdev->ndev,
@@ -1940,7 +1940,7 @@ static void ql_process_mac_split_rx_intr(struct ql_adapter *qdev,
struct iphdr *iph = (struct iphdr *)skb->data;
if (!(iph->frag_off &
- htons(IP_MF|IP_OFFSET))) {
+ htons(IP_MF | IP_OFFSET))) {
skb->ip_summed = CHECKSUM_UNNECESSARY;
netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev,
"TCP checksum done!\n");
@@ -4560,7 +4560,7 @@ static void ql_timer(struct timer_list *t)
return;
}
- mod_timer(&qdev->timer, jiffies + (5*HZ));
+ mod_timer(&qdev->timer, jiffies + (5 * HZ));
}
static int qlge_probe(struct pci_dev *pdev,
@@ -4632,7 +4632,7 @@ static int qlge_probe(struct pci_dev *pdev,
* the bus goes dead
*/
timer_setup(&qdev->timer, ql_timer, TIMER_DEFERRABLE);
- mod_timer(&qdev->timer, jiffies + (5*HZ));
+ mod_timer(&qdev->timer, jiffies + (5 * HZ));
ql_link_off(qdev);
ql_display_dev_info(ndev);
atomic_set(&qdev->lb_count, 0);
@@ -4766,7 +4766,7 @@ static void qlge_io_resume(struct pci_dev *pdev)
netif_err(qdev, ifup, qdev->ndev,
"Device was not running prior to EEH.\n");
}
- mod_timer(&qdev->timer, jiffies + (5*HZ));
+ mod_timer(&qdev->timer, jiffies + (5 * HZ));
netif_device_attach(ndev);
}
@@ -4828,7 +4828,7 @@ static int qlge_resume(struct pci_dev *pdev)
return err;
}
- mod_timer(&qdev->timer, jiffies + (5*HZ));
+ mod_timer(&qdev->timer, jiffies + (5 * HZ));
netif_device_attach(ndev);
return 0;
--
2.20.1
WARNING: multiple messages have this Message-ID (diff)
From: Scott Schafer <schaferjscott@gmail.com>
To: gregkh@linuxfoundation.org
Cc: devel@driverdev.osuosl.org, GR-Linux-NIC-Dev@marvell.com,
Manish Chopra <manishc@marvell.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org,
Scott Schafer <schaferjscott@gmail.com>
Subject: [PATCH v2 13/23] staging: qlge: Fix CHECK: spaces preferred around that (ctx:VxV)
Date: Wed, 11 Dec 2019 12:12:42 -0600 [thread overview]
Message-ID: <a6f197d39478dc6955834412e20b4aed7c7141a2.1576086080.git.schaferjscott@gmail.com> (raw)
In-Reply-To: <cover.1576086080.git.schaferjscott@gmail.com>
Fix CHECK: spaces preferred around that (ctx:VxV) in qlge.h and
qlge_main.c
Signed-off-by: Scott Schafer <schaferjscott@gmail.com>
---
drivers/staging/qlge/qlge.h | 6 +++---
drivers/staging/qlge/qlge_main.c | 18 +++++++++---------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/drivers/staging/qlge/qlge.h b/drivers/staging/qlge/qlge.h
index 63642cb9e624..9ab4c7ce7714 100644
--- a/drivers/staging/qlge/qlge.h
+++ b/drivers/staging/qlge/qlge.h
@@ -59,7 +59,7 @@
#define MAX_CQ 128
#define DFLT_COALESCE_WAIT 100 /* 100 usec wait for coalescing */
#define MAX_INTER_FRAME_WAIT 10 /* 10 usec max interframe-wait for coalescing */
-#define DFLT_INTER_FRAME_WAIT (MAX_INTER_FRAME_WAIT/2)
+#define DFLT_INTER_FRAME_WAIT (MAX_INTER_FRAME_WAIT / 2)
#define UDELAY_COUNT 3
#define UDELAY_DELAY 100
@@ -1366,7 +1366,7 @@ struct tx_ring_desc {
struct tx_ring_desc *next;
};
-#define QL_TXQ_IDX(qdev, skb) (smp_processor_id()%(qdev->tx_ring_count))
+#define QL_TXQ_IDX(qdev, skb) (smp_processor_id() % (qdev->tx_ring_count))
struct tx_ring {
/*
@@ -1790,7 +1790,7 @@ struct ql_reg_dump {
/* segment 34 */
struct mpi_coredump_segment_header ets_seg_hdr;
- u32 ets[8+2];
+ u32 ets[8 + 2];
};
struct ql_mpi_coredump {
diff --git a/drivers/staging/qlge/qlge_main.c b/drivers/staging/qlge/qlge_main.c
index 4dc4edbb2de5..38d217ae4002 100644
--- a/drivers/staging/qlge/qlge_main.c
+++ b/drivers/staging/qlge/qlge_main.c
@@ -706,7 +706,7 @@ static int ql_get_8000_flash_params(struct ql_adapter *qdev)
size = sizeof(struct flash_params_8000) / sizeof(u32);
for (i = 0; i < size; i++, p++) {
- status = ql_read_flash_word(qdev, i+offset, p);
+ status = ql_read_flash_word(qdev, i + offset, p);
if (status) {
netif_err(qdev, ifup, qdev->ndev,
"Error reading flash.\n");
@@ -769,7 +769,7 @@ static int ql_get_8012_flash_params(struct ql_adapter *qdev)
return -ETIMEDOUT;
for (i = 0; i < size; i++, p++) {
- status = ql_read_flash_word(qdev, i+offset, p);
+ status = ql_read_flash_word(qdev, i + offset, p);
if (status) {
netif_err(qdev, ifup, qdev->ndev,
"Error reading flash.\n");
@@ -1544,7 +1544,7 @@ static void ql_process_mac_rx_page(struct ql_adapter *qdev,
struct iphdr *iph =
(struct iphdr *)((u8 *)addr + hlen);
if (!(iph->frag_off &
- htons(IP_MF|IP_OFFSET))) {
+ htons(IP_MF | IP_OFFSET))) {
skb->ip_summed = CHECKSUM_UNNECESSARY;
netif_printk(qdev, rx_status, KERN_DEBUG,
qdev->ndev,
@@ -1651,7 +1651,7 @@ static void ql_process_mac_rx_skb(struct ql_adapter *qdev,
struct iphdr *iph = (struct iphdr *)skb->data;
if (!(iph->frag_off &
- htons(IP_MF|IP_OFFSET))) {
+ htons(IP_MF | IP_OFFSET))) {
skb->ip_summed = CHECKSUM_UNNECESSARY;
netif_printk(qdev, rx_status, KERN_DEBUG,
qdev->ndev,
@@ -1940,7 +1940,7 @@ static void ql_process_mac_split_rx_intr(struct ql_adapter *qdev,
struct iphdr *iph = (struct iphdr *)skb->data;
if (!(iph->frag_off &
- htons(IP_MF|IP_OFFSET))) {
+ htons(IP_MF | IP_OFFSET))) {
skb->ip_summed = CHECKSUM_UNNECESSARY;
netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev,
"TCP checksum done!\n");
@@ -4560,7 +4560,7 @@ static void ql_timer(struct timer_list *t)
return;
}
- mod_timer(&qdev->timer, jiffies + (5*HZ));
+ mod_timer(&qdev->timer, jiffies + (5 * HZ));
}
static int qlge_probe(struct pci_dev *pdev,
@@ -4632,7 +4632,7 @@ static int qlge_probe(struct pci_dev *pdev,
* the bus goes dead
*/
timer_setup(&qdev->timer, ql_timer, TIMER_DEFERRABLE);
- mod_timer(&qdev->timer, jiffies + (5*HZ));
+ mod_timer(&qdev->timer, jiffies + (5 * HZ));
ql_link_off(qdev);
ql_display_dev_info(ndev);
atomic_set(&qdev->lb_count, 0);
@@ -4766,7 +4766,7 @@ static void qlge_io_resume(struct pci_dev *pdev)
netif_err(qdev, ifup, qdev->ndev,
"Device was not running prior to EEH.\n");
}
- mod_timer(&qdev->timer, jiffies + (5*HZ));
+ mod_timer(&qdev->timer, jiffies + (5 * HZ));
netif_device_attach(ndev);
}
@@ -4828,7 +4828,7 @@ static int qlge_resume(struct pci_dev *pdev)
return err;
}
- mod_timer(&qdev->timer, jiffies + (5*HZ));
+ mod_timer(&qdev->timer, jiffies + (5 * HZ));
netif_device_attach(ndev);
return 0;
--
2.20.1
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
next prev parent reply other threads:[~2019-12-11 18:16 UTC|newest]
Thread overview: 70+ 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 ` 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 ` 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 ` 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-11 18:12 ` Scott Schafer
2019-12-17 12:36 ` [PATCH v2 03/23] staging: qlge: " Greg KH
2019-12-17 12:36 ` Greg KH
2019-12-11 18:12 ` [PATCH v2 04/23] " Scott Schafer
2019-12-11 18:12 ` Scott Schafer
2019-12-17 12:37 ` Greg KH
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 ` 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 ` 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 ` 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 ` 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 ` 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 ` 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-11 18:12 ` Scott Schafer
2019-12-12 12:12 ` Dan Carpenter
2019-12-12 12:12 ` Dan Carpenter
2019-12-12 15:02 ` Scott Schafer
2019-12-12 15:02 ` Scott Schafer
2019-12-12 16:03 ` Greg KH
2019-12-12 16:03 ` Greg KH
2019-12-12 16:31 ` Dan Carpenter
2019-12-12 16:31 ` Dan Carpenter
2019-12-12 19:25 ` David Miller
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 ` Scott Schafer
2019-12-11 18:12 ` Scott Schafer [this message]
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 ` 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 ` 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 ` 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 ` 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 ` 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 ` 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-11 18:12 ` Scott Schafer
2019-12-12 10:45 ` Sergei Shtylyov
2019-12-12 10:45 ` Sergei Shtylyov
2019-12-12 11:00 ` Scott Schafer
2019-12-12 11:00 ` Scott Schafer
2019-12-12 11:12 ` Dan Carpenter
2019-12-12 11:12 ` Dan Carpenter
2019-12-12 11:07 ` Dan Carpenter
2019-12-12 11:07 ` Dan Carpenter
2019-12-11 18:12 ` [PATCH v2 21/23] staging: qlge: Fix WARNING: suspect code indent for conditional statements Scott Schafer
2019-12-11 18:12 ` Scott Schafer
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 ` Scott Schafer
2019-12-11 18:12 ` [PATCH v2 23/23] staging: qlge: Fix WARNING: Avoid multiple line dereference Scott Schafer
2019-12-11 18:12 ` 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=a6f197d39478dc6955834412e20b4aed7c7141a2.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.