|
Shung-Hsi Yu |
ebc521 |
From: Dorothea Ehrl <dorothea.ehrl@fau.de>
|
|
Shung-Hsi Yu |
ebc521 |
Date: Wed, 27 Nov 2019 13:30:52 +0100
|
|
Shung-Hsi Yu |
ebc521 |
Subject: staging/qlge: fix block comment coding style
|
|
Shung-Hsi Yu |
ebc521 |
Patch-mainline: v5.6-rc1
|
|
Shung-Hsi Yu |
ebc521 |
Git-commit: 2a51470f270fb7bad89a1c2a60bfc5386c395f8f
|
|
Shung-Hsi Yu |
ebc521 |
References: jsc#SLE-15139
|
|
Shung-Hsi Yu |
ebc521 |
|
|
Shung-Hsi Yu |
ebc521 |
This patch fixes:
|
|
Shung-Hsi Yu |
ebc521 |
"WARNING: block comment use * on subsequent lines"
|
|
Shung-Hsi Yu |
ebc521 |
"WARNING: block comments should align the * on each line"
|
|
Shung-Hsi Yu |
ebc521 |
"WARNING: block comments use a trailing */ on a separate line"
|
|
Shung-Hsi Yu |
ebc521 |
by checkpatch.pl.
|
|
Shung-Hsi Yu |
ebc521 |
|
|
Shung-Hsi Yu |
ebc521 |
Signed-off-by: Dorothea Ehrl <dorothea.ehrl@fau.de>
|
|
Shung-Hsi Yu |
ebc521 |
Co-developed-by: Vanessa Hack <vanessa.hack@fau.de>
|
|
Shung-Hsi Yu |
ebc521 |
Signed-off-by: Vanessa Hack <vanessa.hack@fau.de>
|
|
Shung-Hsi Yu |
ebc521 |
Link: https://lore.kernel.org/r/20191127123052.16424-5-dorothea.ehrl@fau.de
|
|
Shung-Hsi Yu |
ebc521 |
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
Shung-Hsi Yu |
ebc521 |
Acked-by: Shung-Hsi Yu <shung-hsi.yu@suse.com>
|
|
Shung-Hsi Yu |
ebc521 |
---
|
|
Shung-Hsi Yu |
ebc521 |
drivers/staging/qlge/qlge_main.c | 12 +++++++-----
|
|
Shung-Hsi Yu |
ebc521 |
1 file changed, 7 insertions(+), 5 deletions(-)
|
|
Shung-Hsi Yu |
ebc521 |
|
|
Shung-Hsi Yu |
ebc521 |
--- a/drivers/staging/qlge/qlge_main.c
|
|
Shung-Hsi Yu |
ebc521 |
+++ b/drivers/staging/qlge/qlge_main.c
|
|
Shung-Hsi Yu |
ebc521 |
@@ -402,8 +402,8 @@ static int ql_set_mac_addr_reg(struct ql
|
|
Shung-Hsi Yu |
ebc521 |
(index << MAC_ADDR_IDX_SHIFT) | /* index */
|
|
Shung-Hsi Yu |
ebc521 |
type); /* type */
|
|
Shung-Hsi Yu |
ebc521 |
/* This field should also include the queue id
|
|
Shung-Hsi Yu |
ebc521 |
- and possibly the function id. Right now we hardcode
|
|
Shung-Hsi Yu |
ebc521 |
- the route field to NIC core.
|
|
Shung-Hsi Yu |
ebc521 |
+ * and possibly the function id. Right now we hardcode
|
|
Shung-Hsi Yu |
ebc521 |
+ * the route field to NIC core.
|
|
Shung-Hsi Yu |
ebc521 |
*/
|
|
Shung-Hsi Yu |
ebc521 |
cam_output = (CAM_OUT_ROUTE_NIC |
|
|
Shung-Hsi Yu |
ebc521 |
(qdev->
|
|
Shung-Hsi Yu |
ebc521 |
@@ -683,7 +683,7 @@ static int ql_read_flash_word(struct ql_
|
|
Shung-Hsi Yu |
ebc521 |
FLASH_ADDR, FLASH_ADDR_RDY, FLASH_ADDR_ERR);
|
|
Shung-Hsi Yu |
ebc521 |
if (status)
|
|
Shung-Hsi Yu |
ebc521 |
goto exit;
|
|
Shung-Hsi Yu |
ebc521 |
- /* This data is stored on flash as an array of
|
|
Shung-Hsi Yu |
ebc521 |
+ /* This data is stored on flash as an array of
|
|
Shung-Hsi Yu |
ebc521 |
* __le32. Since ql_read32() returns cpu endian
|
|
Shung-Hsi Yu |
ebc521 |
* we need to swap it back.
|
|
Shung-Hsi Yu |
ebc521 |
*/
|
|
Shung-Hsi Yu |
ebc521 |
@@ -2223,7 +2223,8 @@ static int ql_napi_poll_msix(struct napi
|
|
Shung-Hsi Yu |
ebc521 |
"Enter, NAPI POLL cq_id = %d.\n", rx_ring->cq_id);
|
|
Shung-Hsi Yu |
ebc521 |
|
|
Shung-Hsi Yu |
ebc521 |
/* Service the TX rings first. They start
|
|
Shung-Hsi Yu |
ebc521 |
- * right after the RSS rings. */
|
|
Shung-Hsi Yu |
ebc521 |
+ * right after the RSS rings.
|
|
Shung-Hsi Yu |
ebc521 |
+ */
|
|
Shung-Hsi Yu |
ebc521 |
for (i = qdev->rss_ring_count; i < qdev->rx_ring_count; i++) {
|
|
Shung-Hsi Yu |
ebc521 |
trx_ring = &qdev->rx_ring[i];
|
|
Shung-Hsi Yu |
ebc521 |
/* If this TX completion ring belongs to this vector and
|
|
Shung-Hsi Yu |
ebc521 |
@@ -2888,7 +2889,8 @@ static void ql_free_rx_resources(struct
|
|
Shung-Hsi Yu |
ebc521 |
}
|
|
Shung-Hsi Yu |
ebc521 |
|
|
Shung-Hsi Yu |
ebc521 |
/* Allocate queues and buffers for this completions queue based
|
|
Shung-Hsi Yu |
ebc521 |
- * on the values in the parameter structure. */
|
|
Shung-Hsi Yu |
ebc521 |
+ * on the values in the parameter structure.
|
|
Shung-Hsi Yu |
ebc521 |
+ */
|
|
Shung-Hsi Yu |
ebc521 |
static int ql_alloc_rx_resources(struct ql_adapter *qdev,
|
|
Shung-Hsi Yu |
ebc521 |
struct rx_ring *rx_ring)
|
|
Shung-Hsi Yu |
ebc521 |
{
|