Skip to contentSkip to conversation

staging: qlge: Fix indentation issue under long for loop

PATCH Superseded Binyi Han 2 participants 3 messages Jul 10, 2022

Subsystems (3)

v2 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Binyi Han

author
#0 lore raw

PATCH v2 1/1 staging: qlge: Fix indentation issue under long for loop

Fix indentation issue to adhere to Linux kernel coding style, Issue found by checkpatch. And change the long for loop into 3 lines.

---
v2:
- Change the long for loop into 3 lines.

 drivers/staging/qlge/qlge_main.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)
drivers/staging/qlge/qlge_main.c +10 -8
index 1a378330d775..6e771d0e412b 100644
@@ -3007,10 +3007,11 @@ static int qlge_start_rx_ring(struct qlge_adapter *qdev, struct rx_ring *rx_ring
 		tmp = (u64)rx_ring->lbq.base_dma;
 		base_indirect_ptr = rx_ring->lbq.base_indirect;
 
-		for (page_entries = 0; page_entries <
-			MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN); page_entries++)
-				base_indirect_ptr[page_entries] =
-					cpu_to_le64(tmp + (page_entries * DB_PAGE_SIZE));
+		for (page_entries = 0;
+			page_entries < MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN);
+			page_entries++)
+			base_indirect_ptr[page_entries] =
+				cpu_to_le64(tmp + (page_entries * DB_PAGE_SIZE));
 		cqicb->lbq_addr = cpu_to_le64(rx_ring->lbq.base_indirect_dma);
 		cqicb->lbq_buf_size =
 			cpu_to_le16(QLGE_FIT16(qdev->lbq_buf_size));
@@ -3022,10 +3023,11 @@ static int qlge_start_rx_ring(struct qlge_adapter *qdev, struct rx_ring *rx_ring
 		tmp = (u64)rx_ring->sbq.base_dma;
 		base_indirect_ptr = rx_ring->sbq.base_indirect;
 
-		for (page_entries = 0; page_entries <
-			MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN); page_entries++)
-				base_indirect_ptr[page_entries] =
-					cpu_to_le64(tmp + (page_entries * DB_PAGE_SIZE));
+		for (page_entries = 0;
+			page_entries < MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN);
+			page_entries++)
+			base_indirect_ptr[page_entries] =
+				cpu_to_le64(tmp + (page_entries * DB_PAGE_SIZE));
 		cqicb->sbq_addr =
 			cpu_to_le64(rx_ring->sbq.base_indirect_dma);
 		cqicb->sbq_buf_size = cpu_to_le16(SMALL_BUFFER_SIZE);
Signature · 1 line
2.25.1
#1 lore raw
Quoted 18 lines · Binyi Han

Fix indentation issue to adhere to Linux kernel coding style, Issue found by checkpatch. And change the long for loop into 3 lines.

---
v2:
- Change the long for loop into 3 lines.

 drivers/staging/qlge/qlge_main.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)
drivers/staging/qlge/qlge_main.c +0 -0
index 1a378330d775..6e771d0e412b 100644
@@ -3007,10 +3007,11 @@ static int qlge_start_rx_ring(struct qlge_adapter *qdev, struct rx_ring *rx_ring
 		tmp = (u64)rx_ring->lbq.base_dma;
 		base_indirect_ptr = rx_ring->lbq.base_indirect;

drivers/staging/qlge/qlge_main.c static int qlge_start_rx_ring(struct qlge_adapter *qdev, struct rx_ring *rx_ring · line 3014

Quoted 10 lines
drivers/staging/qlge/qlge_main.c +5 -4
 
-		for (page_entries = 0; page_entries <
-			MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN); page_entries++)
-				base_indirect_ptr[page_entries] =
-					cpu_to_le64(tmp + (page_entries * DB_PAGE_SIZE));
+		for (page_entries = 0;
+			page_entries < MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN);
+			page_entries++)
+			base_indirect_ptr[page_entries] =
+				cpu_to_le64(tmp + (page_entries * DB_PAGE_SIZE));

Better to align page_entries to the open parenthesis.

And another optimization would be to simply add DB_PAGE_SIZE to tmp in the loop and avoid the multiply.

		for (page_entries = 0;
		     page_entries < MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN);
		     page_entries++) {
			base_indirect_ptr[page_entries] = cpu_to_le64(tmp);
			tmp += DB_PAGE_SIZE;
		}

drivers/staging/qlge/qlge_main.c static int qlge_start_rx_ring(struct qlge_adapter *qdev, struct rx_ring *rx_ring · line 3030

Quoted 13 lines
drivers/staging/qlge/qlge_main.c +5 -4
@@ -3022,10 +3023,11 @@ static int qlge_start_rx_ring(struct qlge_adapter *qdev, struct rx_ring *rx_ring
 		tmp = (u64)rx_ring->sbq.base_dma;
 		base_indirect_ptr = rx_ring->sbq.base_indirect;
 
-		for (page_entries = 0; page_entries <
-			MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN); page_entries++)
-				base_indirect_ptr[page_entries] =
-					cpu_to_le64(tmp + (page_entries * DB_PAGE_SIZE));
+		for (page_entries = 0;
+			page_entries < MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN);
+			page_entries++)
+			base_indirect_ptr[page_entries] =
+				cpu_to_le64(tmp + (page_entries * DB_PAGE_SIZE));

here too

author
#2 lore raw
Quoted 46 lines · Joe Perches
Quoted 18 lines · Binyi Han

Fix indentation issue to adhere to Linux kernel coding style, Issue found by checkpatch. And change the long for loop into 3 lines.

---
v2:
- Change the long for loop into 3 lines.

 drivers/staging/qlge/qlge_main.c | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)
drivers/staging/qlge/qlge_main.c +0 -0
index 1a378330d775..6e771d0e412b 100644
@@ -3007,10 +3007,11 @@ static int qlge_start_rx_ring(struct qlge_adapter *qdev, struct rx_ring *rx_ring
 		tmp = (u64)rx_ring->lbq.base_dma;
 		base_indirect_ptr = rx_ring->lbq.base_indirect;

drivers/staging/qlge/qlge_main.c static int qlge_start_rx_ring(struct qlge_adapter *qdev, struct rx_ring *rx_ring · line 3014

Quoted 10 lines
drivers/staging/qlge/qlge_main.c +5 -4
 
-		for (page_entries = 0; page_entries <
-			MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN); page_entries++)
-				base_indirect_ptr[page_entries] =
-					cpu_to_le64(tmp + (page_entries * DB_PAGE_SIZE));
+		for (page_entries = 0;
+			page_entries < MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN);
+			page_entries++)
+			base_indirect_ptr[page_entries] =
+				cpu_to_le64(tmp + (page_entries * DB_PAGE_SIZE));

Better to align page_entries to the open parenthesis.

And another optimization would be to simply add DB_PAGE_SIZE to tmp in the loop and avoid the multiply.

		for (page_entries = 0;
		     page_entries < MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN);
		     page_entries++) {
			base_indirect_ptr[page_entries] = cpu_to_le64(tmp);
			tmp += DB_PAGE_SIZE;
		}
Quoted 4 lines
drivers/staging/qlge/qlge_main.c +0 -0
@@ -3022,10 +3023,11 @@ static int qlge_start_rx_ring(struct qlge_adapter *qdev, struct rx_ring *rx_ring
 		tmp = (u64)rx_ring->sbq.base_dma;
 		base_indirect_ptr = rx_ring->sbq.base_indirect;
 
Quoted 12 lines

drivers/staging/qlge/qlge_main.c static int qlge_start_rx_ring(struct qlge_adapter *qdev, struct rx_ring *rx_ring · line 3014

Quoted 9 lines
drivers/staging/qlge/qlge_main.c +5 -4
-		for (page_entries = 0; page_entries <
-			MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN); page_entries++)
-				base_indirect_ptr[page_entries] =
-					cpu_to_le64(tmp + (page_entries * DB_PAGE_SIZE));
+		for (page_entries = 0;
+			page_entries < MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN);
+			page_entries++)
+			base_indirect_ptr[page_entries] =
+				cpu_to_le64(tmp + (page_entries * DB_PAGE_SIZE));

here too

Ah I see, that makes sense. Thanks for reviewing!