staging: qlge: qlge.h: cleanup suggested by checkpatch

PATCH Superseded Payal Kshirsagar 2 participants 8 messages Mar 9, 2020

Subsystems (2)

USB Staging

lore

Share & tools

lore

Payal Kshirsagar

author

2020-03-09 13:14 UTC #0 lore raw

cover staging: qlge: qlge.h: cleanup suggested by checkpatch

Cleanup suggested by checkpatch for the file drivers/staging/qlge/qlge.h.

Payal Kshirsagar (3):
[Outreachy kernel] staging: qlge: remove spaces before tabs and align
code
[Outreachy kernel] staging: qlge: qlge.h: add spaces around operators [Outreachy kernel] staging: qlge: qlge.h: remove excess newlines

 drivers/staging/qlge/qlge.h | 69 ++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 36 deletions(-)

Signature · 1 line

2.17.1

Payal Kshirsagar

author

2020-03-09 13:15 UTC #1 lore raw

PATCH 1/3 staging: qlge: remove spaces before tabs and align code

Remove white spaces before tabs and align code properly for readability.

Signed-off-by Payal Kshirsagar <[email protected]>

---
 drivers/staging/qlge/qlge.h | 60 ++++++++++++++++++-------------------
 1 file changed, 30 insertions(+), 30 deletions(-)

drivers/staging/qlge/qlge.h +30 ~~-30~~

index 4bc5d5fce9bf..66641edff6b5 100644
@@ -16,8 +16,8 @@
 /*
  * General definitions...
  */
-#define DRV_NAME  	"qlge"
-#define DRV_STRING 	"QLogic 10 Gigabit PCI-E Ethernet Driver "
+#define DRV_NAME	"qlge"
+#define DRV_STRING	"QLogic 10 Gigabit PCI-E Ethernet Driver "
 #define DRV_VERSION	"1.00.00.35"
 
 #define WQ_ADDR_ALIGN	0x3	/* 4 byte alignment */

@@ -1077,11 +1077,11 @@ struct tx_buf_desc {
  * IOCB Definitions...
  */
 
-#define OPCODE_OB_MAC_IOCB 			0x01
+#define OPCODE_OB_MAC_IOCB		0x01
 #define OPCODE_OB_MAC_TSO_IOCB		0x02
-#define OPCODE_IB_MAC_IOCB			0x20
-#define OPCODE_IB_MPI_IOCB			0x21
-#define OPCODE_IB_AE_IOCB			0x3f
+#define OPCODE_IB_MAC_IOCB		0x20
+#define OPCODE_IB_MPI_IOCB		0x21
+#define OPCODE_IB_AE_IOCB		0x3f
 
 struct ob_mac_iocb_req {
 	u8 opcode;

@@ -1173,15 +1173,15 @@ struct ib_mac_iocb_rsp {
 	u8 flags1;
 #define IB_MAC_IOCB_RSP_OI	0x01	/* Override intr delay */
 #define IB_MAC_IOCB_RSP_I	0x02	/* Disable Intr Generation */
-#define IB_MAC_CSUM_ERR_MASK 0x1c	/* A mask to use for csum errs */
+#define IB_MAC_CSUM_ERR_MASK	0x1c	/* A mask to use for csum errs */
 #define IB_MAC_IOCB_RSP_TE	0x04	/* Checksum error */
 #define IB_MAC_IOCB_RSP_NU	0x08	/* No checksum rcvd */
 #define IB_MAC_IOCB_RSP_IE	0x10	/* IPv4 checksum error */
 #define IB_MAC_IOCB_RSP_M_MASK	0x60	/* Multicast info */
 #define IB_MAC_IOCB_RSP_M_NONE	0x00	/* Not mcast frame */
 #define IB_MAC_IOCB_RSP_M_HASH	0x20	/* HASH mcast frame */
-#define IB_MAC_IOCB_RSP_M_REG 	0x40	/* Registered mcast frame */
-#define IB_MAC_IOCB_RSP_M_PROM 	0x60	/* Promiscuous mcast frame */
+#define IB_MAC_IOCB_RSP_M_REG	0x40	/* Registered mcast frame */
+#define IB_MAC_IOCB_RSP_M_PROM	0x60	/* Promiscuous mcast frame */
 #define IB_MAC_IOCB_RSP_B	0x80	/* Broadcast frame */
 	u8 flags2;
 #define IB_MAC_IOCB_RSP_P	0x01	/* Promiscuous frame */

@@ -1198,16 +1198,16 @@ struct ib_mac_iocb_rsp {
 #define IB_MAC_IOCB_RSP_FO	0x80	/* Failover port */
 	u8 flags3;
 #define IB_MAC_IOCB_RSP_RSS_MASK	0x07	/* RSS mask */
-#define IB_MAC_IOCB_RSP_M_NONE	0x00	/* No RSS match */
-#define IB_MAC_IOCB_RSP_M_IPV4	0x04	/* IPv4 RSS match */
-#define IB_MAC_IOCB_RSP_M_IPV6	0x02	/* IPv6 RSS match */
-#define IB_MAC_IOCB_RSP_M_TCP_V4 	0x05	/* TCP with IPv4 */
-#define IB_MAC_IOCB_RSP_M_TCP_V6 	0x03	/* TCP with IPv6 */
-#define IB_MAC_IOCB_RSP_V4	0x08	/* IPV4 */
-#define IB_MAC_IOCB_RSP_V6	0x10	/* IPV6 */
-#define IB_MAC_IOCB_RSP_IH	0x20	/* Split after IP header */
-#define IB_MAC_IOCB_RSP_DS	0x40	/* data is in small buffer */
-#define IB_MAC_IOCB_RSP_DL	0x80	/* data is in large buffer */
+#define IB_MAC_IOCB_RSP_M_NONE		0x00	/* No RSS match */
+#define IB_MAC_IOCB_RSP_M_IPV4		0x04	/* IPv4 RSS match */
+#define IB_MAC_IOCB_RSP_M_IPV6		0x02	/* IPv6 RSS match */
+#define IB_MAC_IOCB_RSP_M_TCP_V4	0x05	/* TCP with IPv4 */
+#define IB_MAC_IOCB_RSP_M_TCP_V6	0x03	/* TCP with IPv6 */
+#define IB_MAC_IOCB_RSP_V4		0x08	/* IPV4 */
+#define IB_MAC_IOCB_RSP_V6		0x10	/* IPV6 */
+#define IB_MAC_IOCB_RSP_IH		0x20	/* Split after IP header */
+#define IB_MAC_IOCB_RSP_DS		0x40	/* data is in small buffer */
+#define IB_MAC_IOCB_RSP_DL		0x80	/* data is in large buffer */
 	__le32 data_len;	/* */
 	__le64 data_addr;	/* */
 	__le32 rss;		/* */

@@ -1233,17 +1233,17 @@ struct ib_ae_iocb_rsp {
 #define IB_AE_IOCB_RSP_OI		0x01
 #define IB_AE_IOCB_RSP_I		0x02
 	u8 event;
-#define LINK_UP_EVENT              0x00
-#define LINK_DOWN_EVENT            0x01
-#define CAM_LOOKUP_ERR_EVENT       0x06
-#define SOFT_ECC_ERROR_EVENT       0x07
-#define MGMT_ERR_EVENT             0x08
-#define TEN_GIG_MAC_EVENT          0x09
-#define GPI0_H2L_EVENT       	0x10
-#define GPI0_L2H_EVENT       	0x20
-#define GPI1_H2L_EVENT       	0x11
-#define GPI1_L2H_EVENT       	0x21
-#define PCI_ERR_ANON_BUF_RD        0x40
+#define LINK_UP_EVENT			0x00
+#define LINK_DOWN_EVENT			0x01
+#define CAM_LOOKUP_ERR_EVENT		0x06
+#define SOFT_ECC_ERROR_EVENT		0x07
+#define MGMT_ERR_EVENT			0x08
+#define TEN_GIG_MAC_EVENT		0x09
+#define GPI0_H2L_EVENT			0x10
+#define GPI0_L2H_EVENT			0x20
+#define GPI1_H2L_EVENT			0x11
+#define GPI1_L2H_EVENT			0x21
+#define PCI_ERR_ANON_BUF_RD		0x40
 	u8 q_id;
 	__le32 reserved[15];
 } __packed;

Signature · 1 line

2.17.1

Payal Kshirsagar

author

2020-03-09 13:15 UTC #2 lore raw

PATCH 2/3 staging: qlge: qlge.h: add spaces around operators

In reply to Payal Kshirsagar

Add spaces around operators cleanup reported by checkpatch.

Signed-off-by Payal Kshirsagar <[email protected]>

---
 drivers/staging/qlge/qlge.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

drivers/staging/qlge/qlge.h +3 -3

index 66641edff6b5..4ef8dae3d7a0 100644
@@ -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

@@ -1367,7 +1367,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 {
 	/*

@@ -1792,7 +1792,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 {

Signature · 1 line

2.17.1

Julia Lawall

2020-03-09 13:24 UTC #3 lore raw

Re: [PATCH 2/3] [Outreachy kernel] staging: qlge: qlge.h: add spaces around operators

Quoted 1 line · Payal Kshirsagar

Add spaces around operators cleanup reported by checkpatch.

This is too much for one sentence.

Add spaces around operators. Cleanup suggested by checkpatch.

julia

Quoted 45 lines

Signed-off-by Payal Kshirsagar <[email protected]>

---
 drivers/staging/qlge/qlge.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

drivers/staging/qlge/qlge.h +3 -4

index 66641edff6b5..4ef8dae3d7a0 100644
@@ -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

@@ -1367,7 +1367,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 {
 	/*

@@ -1792,7 +1792,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 {
--

2.17.1

--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected].
To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/3a471ee901679659280d420549610b12e9efcdf6.1583759118.git.payalskshirsagar1234%40gmail.com.

Payal Kshirsagar

author

2020-03-09 13:15 UTC #4 lore raw

PATCH 3/3 staging: qlge: qlge.h: remove excess newlines

In reply to Payal Kshirsagar

Blank lines aren't necessary after an open brace '{'.

Signed-off-by Payal Kshirsagar <[email protected]>

---
 drivers/staging/qlge/qlge.h | 3 ---
 1 file changed, 3 deletions(-)

drivers/staging/qlge/qlge.h +0 -3

index 4ef8dae3d7a0..fc8c5ca8935d 100644
@@ -119,7 +119,6 @@ enum {
  * Processor Address Register (PROC_ADDR) bit definitions.
  */
 enum {
-
 	/* Misc. stuff */
 	MAILBOX_COUNT = 16,
 	MAILBOX_TIMEOUT = 5,

@@ -1762,7 +1761,6 @@ struct ql_nic_misc {
 };
 
 struct ql_reg_dump {
-
 	/* segment 0 */
 	struct mpi_coredump_global_header mpi_global_header;

@@ -2059,7 +2057,6 @@ enum {
 };
 
 struct nic_operations {
-
 	int (*get_flash) (struct ql_adapter *);
 	int (*port_initialize) (struct ql_adapter *);
 };

Signature · 1 line

2.17.1

Julia Lawall

2020-03-09 13:18 UTC #5 lore raw

In reply to Payal Kshirsagar

Quoted 7 lines · Payal Kshirsagar

Cleanup suggested by checkpatch for the file drivers/staging/qlge/qlge.h.
Payal Kshirsagar (3):
[Outreachy kernel] staging: qlge: remove spaces before tabs and align
code
[Outreachy kernel] staging: qlge: qlge.h: add spaces around operators [Outreachy kernel] staging: qlge: qlge.h: remove excess newlines

It's strange that the information about the location is different in the first case than in the other two cases, if they are all touching the same file?

julia

Quoted 12 lines

 drivers/staging/qlge/qlge.h | 69 ++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 36 deletions(-)
--
2.17.1
--
You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/cover.1583759118.git.payalskshirsagar1234%40gmail.com.

Payal Kshirsagar

author

2020-03-09 14:41 UTC #6 lore raw

Quoted 12 lines · Julia Lawall

Quoted 7 lines · Payal Kshirsagar
Cleanup suggested by checkpatch for the file drivers/staging/qlge/qlge.h.
Payal Kshirsagar (3):
[Outreachy kernel] staging: qlge: remove spaces before tabs and align
code
[Outreachy kernel] staging: qlge: qlge.h: add spaces around operators [Outreachy kernel] staging: qlge: qlge.h: remove excess newlines

Quoted 4 lines

It's strange that the information about the location is different in the first case than in the other two cases, if they are all touching the same file?

Yes, all the patches of this series cleaning a same file, the subject line in first patch of this series was my mistake.
What I supposed to do now ?

Payal

julia

Quoted 18 lines

Quoted 10 lines
 drivers/staging/qlge/qlge.h | 69 ++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 36 deletions(-)
--
2.17.1
--
You received this message because you are subscribed to the Google
Groups "outreachy-kernel" group.
Quoted 1 line
To unsubscribe from this group and stop receiving emails from it, send
an email to [email protected].
Quoted 1 line
To view this discussion on the web visit
https://groups.google.com/d/msgid/outreachy-kernel/cover.1583759118.git.payalskshirsagar1234%40gmail.com
.
Quoted 1 line

Julia Lawall

2020-03-09 14:46 UTC #7 lore raw

Quoted 26 lines · Payal Kshirsagar

On Mon, Mar 9, 2020, 6:48 PM Julia Lawall <[email protected]> wrote:
On Mon, 9 Mar 2020, Payal Kshirsagar wrote:
> Cleanup suggested by checkpatch for the file drivers/staging/qlge/qlge.h.
>
> Payal Kshirsagar (3):
> [Outreachy kernel] staging: qlge: remove spaces before tabs and align
> code
> [Outreachy kernel] staging: qlge: qlge.h: add spaces around operators
> [Outreachy kernel] staging: qlge: qlge.h: remove excess newlines
It's strange that the information about the location is different in the
first case than in the other two cases, if they are all touching the same
file?

Quoted 3 lines

Yes, all the patches of this series cleaning a same file, the subject line in first patch of this series was my mistake.
What I supposed to do now ?

Resend the series. Explain under the --- what you changed in the patch that you changed. For the other two, say under the --- that nothing has changed.

julia