staging: qlge: Remove page_chunk.last_flag

As already done in ql_get_curr_lchunk(), this member can be replaced by a
simple test.

Signed-off-by: Benjamin Poirier <bpoirier@suse.com>
Acked-by: Manish Chopra <manishc@marvell.com>
Link: https://lore.kernel.org/r/20190927101210.23856-4-bpoirier@suse.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/staging/qlge/qlge.h b/drivers/staging/qlge/qlge.h
index 5d9a36d..0a156a9 100644 (file)
--- a/drivers/staging/qlge/qlge.h
+++ b/drivers/staging/qlge/qlge.h
@@ -1363,7 +1363,6 @@ struct page_chunk {
        char *va;               /* virt addr for this chunk */
        u64 map;                /* mapping for master */
        unsigned int offset;    /* offset for this chunk */
-       unsigned int last_flag; /* flag set for last chunk in page */
 };
 
 struct bq_desc {

diff --git a/drivers/staging/qlge/qlge_main.c b/drivers/staging/qlge/qlge_main.c
index 7a8d639..a829207 100644 (file)
--- a/drivers/staging/qlge/qlge_main.c
+++ b/drivers/staging/qlge/qlge_main.c
@@ -1077,11 +1077,9 @@ static int ql_get_next_chunk(struct ql_adapter *qdev, struct rx_ring *rx_ring,
        rx_ring->pg_chunk.offset += rx_ring->lbq_buf_size;
        if (rx_ring->pg_chunk.offset == ql_lbq_block_size(qdev)) {
                rx_ring->pg_chunk.page = NULL;
-               lbq_desc->p.pg_chunk.last_flag = 1;
        } else {
                rx_ring->pg_chunk.va += rx_ring->lbq_buf_size;
                get_page(rx_ring->pg_chunk.page);
-               lbq_desc->p.pg_chunk.last_flag = 0;
        }
        return 0;
 }
@@ -2778,6 +2776,8 @@ pci_alloc_err:
 
 static void ql_free_lbq_buffers(struct ql_adapter *qdev, struct rx_ring *rx_ring)
 {
+       unsigned int last_offset = ql_lbq_block_size(qdev) -
+               rx_ring->lbq_buf_size;
        struct bq_desc *lbq_desc;
 
        uint32_t  curr_idx, clean_idx;
@@ -2787,13 +2787,10 @@ static void ql_free_lbq_buffers(struct ql_adapter *qdev, struct rx_ring *rx_ring
        while (curr_idx != clean_idx) {
                lbq_desc = &rx_ring->lbq[curr_idx];
 
-               if (lbq_desc->p.pg_chunk.last_flag) {
-                       pci_unmap_page(qdev->pdev,
-                               lbq_desc->p.pg_chunk.map,
-                               ql_lbq_block_size(qdev),
+               if (lbq_desc->p.pg_chunk.offset == last_offset)
+                       pci_unmap_page(qdev->pdev, lbq_desc->p.pg_chunk.map,
+                                      ql_lbq_block_size(qdev),
                                       PCI_DMA_FROMDEVICE);
-                       lbq_desc->p.pg_chunk.last_flag = 0;
-               }
 
                put_page(lbq_desc->p.pg_chunk.page);
                lbq_desc->p.pg_chunk.page = NULL;