2022-06-09 22:03:35

by Srivathsan Sivakumar

Subject: [PATCH v2] staging: qlge: qlge_main.c: rewrite do-while loops into more compact for loops

simplify do-while loops into for loops

Signed-off-by: Srivathsan Sivakumar <[email protected]>
---
Changes in v2:
- Rewrite for loops more compactly

drivers/staging/qlge/qlge_main.c | 24 ++++++++++--------------
1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/drivers/staging/qlge/qlge_main.c b/drivers/staging/qlge/qlge_main.c
index 8c35d4c4b851..689a87d58f27 100644
--- a/drivers/staging/qlge/qlge_main.c
+++ b/drivers/staging/qlge/qlge_main.c
@@ -3006,13 +3006,11 @@ static int qlge_start_rx_ring(struct qlge_adapter *qdev, struct rx_ring *rx_ring
cqicb->flags |= FLAGS_LL; /* Load lbq values */
tmp = (u64)rx_ring->lbq.base_dma;
base_indirect_ptr = rx_ring->lbq.base_indirect;
- page_entries = 0;
- do {
- *base_indirect_ptr = cpu_to_le64(tmp);
- tmp += DB_PAGE_SIZE;
- base_indirect_ptr++;
- page_entries++;
- } while (page_entries < MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN));
+
+ 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));
@@ -3023,13 +3021,11 @@ static int qlge_start_rx_ring(struct qlge_adapter *qdev, struct rx_ring *rx_ring
cqicb->flags |= FLAGS_LS; /* Load sbq values */
tmp = (u64)rx_ring->sbq.base_dma;
base_indirect_ptr = rx_ring->sbq.base_indirect;
- page_entries = 0;
- do {
- *base_indirect_ptr = cpu_to_le64(tmp);
- tmp += DB_PAGE_SIZE;
- base_indirect_ptr++;
- page_entries++;
- } while (page_entries < MAX_DB_PAGES_PER_BQ(QLGE_BQ_LEN));
+
+ 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);
--
2.34.1

2022-06-10 06:35:39

by Dan Carpenter

Subject: Re: [PATCH v2] staging: qlge: qlge_main.c: rewrite do-while loops into more compact for loops

On Thu, Jun 09, 2022 at 04:46:39PM -0400, Srivathsan Sivakumar wrote:
> simplify do-while loops into for loops
>
> Signed-off-by: Srivathsan Sivakumar <[email protected]>
> ---
> Changes in v2:
> - Rewrite for loops more compactly

Thanks!

Reviewed-by: Dan Carpenter <[email protected]>

regards,
dan carpenter

2022-06-13 03:26:48

by Benjamin Poirier

Subject: Re: [PATCH v2] staging: qlge: qlge_main.c: rewrite do-while loops into more compact for loops

On 2022-06-09 16:46 -0400, Srivathsan Sivakumar wrote:
> simplify do-while loops into for loops
>
> Signed-off-by: Srivathsan Sivakumar <[email protected]>
> ---
> Changes in v2:
> - Rewrite for loops more compactly
>
> drivers/staging/qlge/qlge_main.c | 24 ++++++++++--------------
> 1 file changed, 10 insertions(+), 14 deletions(-)

Please also update the TODO file to remove the respective entry. The
other referenced problem instance was already fixed in commit
41e1bf811ace ("Staging: qlge: Rewrite two while loops as simple for
loops")