Skip to contentSkip to conversation

staging: qlge: remove extra blank lines

PATCH In review Deepak R Varma 2 participants 3 messages Oct 15, 2020 – Oct 16, 2020 Staging

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 staging: qlge: remove extra blank lines

Remove unnecessary blank lines as per the coding style guidelines. Issue reported by checkpatch script.

---
Changes since v1:
- Correct typo in the patch description.

 drivers/staging/qlge/qlge_main.c | 9 ---------
 1 file changed, 9 deletions(-)
drivers/staging/qlge/qlge_main.c +0 -9
index cb19cd35d0da..406374a5a431 100644
@@ -756,7 +756,6 @@ static int ql_get_8012_flash_params(struct ql_adapter *qdev)
 				  "Error reading flash.\n");
 			goto exit;
 		}
-
 	}
 
 	status = ql_validate_flash(qdev,
@@ -1225,7 +1224,6 @@ static void ql_unmap_send(struct ql_adapter *qdev,
 						     maplen), DMA_TO_DEVICE);
 		}
 	}
-
 }
 
 /* Map the buffers for this transmit.  This will return
@@ -1339,7 +1337,6 @@ static int ql_map_send(struct ql_adapter *qdev,
 		dma_unmap_addr_set(&tx_ring_desc->map[map_idx], mapaddr, map);
 		dma_unmap_len_set(&tx_ring_desc->map[map_idx], maplen,
 				  skb_frag_size(frag));
-
 	}
 	/* Save the number of segments we've mapped. */
 	tx_ring_desc->map_cnt = map_idx;
@@ -2103,7 +2100,6 @@ static int ql_clean_outbound_rx_ring(struct rx_ring *rx_ring)
 	struct tx_ring *tx_ring;
 	/* While there are entries in the completion queue. */
 	while (prod != rx_ring->cnsmr_idx) {
-
 		netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev,
 			     "cq_id = %d, prod = %d, cnsmr = %d\n",
 			     rx_ring->cq_id, prod, rx_ring->cnsmr_idx);
@@ -2111,7 +2107,6 @@ static int ql_clean_outbound_rx_ring(struct rx_ring *rx_ring)
 		net_rsp = (struct ob_mac_iocb_rsp *)rx_ring->curr_entry;
 		rmb();
 		switch (net_rsp->opcode) {
-
 		case OPCODE_OB_MAC_TSO_IOCB:
 		case OPCODE_OB_MAC_IOCB:
 			ql_process_mac_tx_intr(qdev, net_rsp);
@@ -2150,7 +2145,6 @@ static int ql_clean_inbound_rx_ring(struct rx_ring *rx_ring, int budget)
 
 	/* While there are entries in the completion queue. */
 	while (prod != rx_ring->cnsmr_idx) {
-
 		netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev,
 			     "cq_id = %d, prod = %d, cnsmr = %d\n",
 			     rx_ring->cq_id, prod, rx_ring->cnsmr_idx);
@@ -2462,7 +2456,6 @@ static irqreturn_t qlge_isr(int irq, void *dev_id)
 
 static int ql_tso(struct sk_buff *skb, struct ob_mac_tso_iocb_req *mac_iocb_ptr)
 {
-
 	if (skb_is_gso(skb)) {
 		int err;
 		__be16 l3_proto = vlan_get_protocol(skb);
@@ -2869,7 +2862,6 @@ static void ql_free_rx_resources(struct ql_adapter *qdev,
 static int ql_alloc_rx_resources(struct ql_adapter *qdev,
 				 struct rx_ring *rx_ring)
 {
-
 	/*
 	 * Allocate the completion queue for this rx_ring.
 	 */
@@ -3798,7 +3790,6 @@ static int ql_wol(struct ql_adapter *qdev)
 
 static void ql_cancel_all_work_sync(struct ql_adapter *qdev)
 {
-
 	/* Don't kill the reset worker thread if we
 	 * are in the process of recovery.
 	 */
Signature · 1 line
2.25.1
Reviewed-by on v2 1/1
#1 lore raw
Quoted 3 lines · Deepak R Varma

Remove unnecessary blank lines as per the coding style guidelines. Issue reported by checkpatch script.

It seems like your mail client [or maybe you] is adding an extra blank line after signed-off-by. You should fix that in your setting. Other than that, the change looks fine to me.

Quoted 1 line
Quoted 90 lines

---
Changes since v1:
- Correct typo in the patch description.

 drivers/staging/qlge/qlge_main.c | 9 ---------
 1 file changed, 9 deletions(-)
drivers/staging/qlge/qlge_main.c +0 -10
index cb19cd35d0da..406374a5a431 100644
@@ -756,7 +756,6 @@ static int ql_get_8012_flash_params(struct ql_adapter *qdev)
                                  "Error reading flash.\n");
                        goto exit;
                }
-
        }
 
        status = ql_validate_flash(qdev,
@@ -1225,7 +1224,6 @@ static void ql_unmap_send(struct ql_adapter *qdev,
                                                     maplen), DMA_TO_DEVICE);
                }
        }
-
 }
 
 /* Map the buffers for this transmit.  This will return
@@ -1339,7 +1337,6 @@ static int ql_map_send(struct ql_adapter *qdev,
                dma_unmap_addr_set(&tx_ring_desc->map[map_idx], mapaddr, map);
                dma_unmap_len_set(&tx_ring_desc->map[map_idx], maplen,
                                  skb_frag_size(frag));
-
        }
        /* Save the number of segments we've mapped. */
        tx_ring_desc->map_cnt = map_idx;
@@ -2103,7 +2100,6 @@ static int ql_clean_outbound_rx_ring(struct rx_ring *rx_ring)
        struct tx_ring *tx_ring;
        /* While there are entries in the completion queue. */
        while (prod != rx_ring->cnsmr_idx) {
-
                netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev,
                             "cq_id = %d, prod = %d, cnsmr = %d\n",
                             rx_ring->cq_id, prod, rx_ring->cnsmr_idx);
@@ -2111,7 +2107,6 @@ static int ql_clean_outbound_rx_ring(struct rx_ring *rx_ring)
                net_rsp = (struct ob_mac_iocb_rsp *)rx_ring->curr_entry;
                rmb();
                switch (net_rsp->opcode) {
-
                case OPCODE_OB_MAC_TSO_IOCB:
                case OPCODE_OB_MAC_IOCB:
                        ql_process_mac_tx_intr(qdev, net_rsp);
@@ -2150,7 +2145,6 @@ static int ql_clean_inbound_rx_ring(struct rx_ring *rx_ring, int budget)
 
        /* While there are entries in the completion queue. */
        while (prod != rx_ring->cnsmr_idx) {
-
                netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev,
                             "cq_id = %d, prod = %d, cnsmr = %d\n",
                             rx_ring->cq_id, prod, rx_ring->cnsmr_idx);
@@ -2462,7 +2456,6 @@ static irqreturn_t qlge_isr(int irq, void *dev_id)
 
 static int ql_tso(struct sk_buff *skb, struct ob_mac_tso_iocb_req *mac_iocb_ptr)
 {
-
        if (skb_is_gso(skb)) {
                int err;
                __be16 l3_proto = vlan_get_protocol(skb);
@@ -2869,7 +2862,6 @@ static void ql_free_rx_resources(struct ql_adapter *qdev,
 static int ql_alloc_rx_resources(struct ql_adapter *qdev,
                                 struct rx_ring *rx_ring)
 {
-
        /*
         * Allocate the completion queue for this rx_ring.
         */
@@ -3798,7 +3790,6 @@ static int ql_wol(struct ql_adapter *qdev)
 
 static void ql_cancel_all_work_sync(struct ql_adapter *qdev)
 {
-
        /* Don't kill the reset worker thread if we
         * are in the process of recovery.
         */
--

2.25.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/20201015031946.GA16455%40ubuntu204.

Signature · 2 lines
Vaishali
http://vaishalithakkar.in/
#2 lore raw
Quoted 9 lines · Vaishali Thakkar
Quoted 3 lines · Deepak R Varma

Remove unnecessary blank lines as per the coding style guidelines. Issue reported by checkpatch script.

It seems like your mail client [or maybe you] is adding an extra blank line after signed-off-by. You should fix that in your setting. Other than that, the change looks fine to me.

That was me. I will take care going forward.
Thank you.

Deepak.

Quoted 100 lines
Quoted 1 line
Quoted 90 lines

---
Changes since v1:
- Correct typo in the patch description.

 drivers/staging/qlge/qlge_main.c | 9 ---------
 1 file changed, 9 deletions(-)
drivers/staging/qlge/qlge_main.c +0 -10
index cb19cd35d0da..406374a5a431 100644
@@ -756,7 +756,6 @@ static int ql_get_8012_flash_params(struct ql_adapter *qdev)
                                  "Error reading flash.\n");
                        goto exit;
                }
-
        }
 
        status = ql_validate_flash(qdev,
@@ -1225,7 +1224,6 @@ static void ql_unmap_send(struct ql_adapter *qdev,
                                                     maplen), DMA_TO_DEVICE);
                }
        }
-
 }
 
 /* Map the buffers for this transmit.  This will return
@@ -1339,7 +1337,6 @@ static int ql_map_send(struct ql_adapter *qdev,
                dma_unmap_addr_set(&tx_ring_desc->map[map_idx], mapaddr, map);
                dma_unmap_len_set(&tx_ring_desc->map[map_idx], maplen,
                                  skb_frag_size(frag));
-
        }
        /* Save the number of segments we've mapped. */
        tx_ring_desc->map_cnt = map_idx;
@@ -2103,7 +2100,6 @@ static int ql_clean_outbound_rx_ring(struct rx_ring *rx_ring)
        struct tx_ring *tx_ring;
        /* While there are entries in the completion queue. */
        while (prod != rx_ring->cnsmr_idx) {
-
                netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev,
                             "cq_id = %d, prod = %d, cnsmr = %d\n",
                             rx_ring->cq_id, prod, rx_ring->cnsmr_idx);
@@ -2111,7 +2107,6 @@ static int ql_clean_outbound_rx_ring(struct rx_ring *rx_ring)
                net_rsp = (struct ob_mac_iocb_rsp *)rx_ring->curr_entry;
                rmb();
                switch (net_rsp->opcode) {
-
                case OPCODE_OB_MAC_TSO_IOCB:
                case OPCODE_OB_MAC_IOCB:
                        ql_process_mac_tx_intr(qdev, net_rsp);
@@ -2150,7 +2145,6 @@ static int ql_clean_inbound_rx_ring(struct rx_ring *rx_ring, int budget)
 
        /* While there are entries in the completion queue. */
        while (prod != rx_ring->cnsmr_idx) {
-
                netif_printk(qdev, rx_status, KERN_DEBUG, qdev->ndev,
                             "cq_id = %d, prod = %d, cnsmr = %d\n",
                             rx_ring->cq_id, prod, rx_ring->cnsmr_idx);
@@ -2462,7 +2456,6 @@ static irqreturn_t qlge_isr(int irq, void *dev_id)
 
 static int ql_tso(struct sk_buff *skb, struct ob_mac_tso_iocb_req *mac_iocb_ptr)
 {
-
        if (skb_is_gso(skb)) {
                int err;
                __be16 l3_proto = vlan_get_protocol(skb);
@@ -2869,7 +2862,6 @@ static void ql_free_rx_resources(struct ql_adapter *qdev,
 static int ql_alloc_rx_resources(struct ql_adapter *qdev,
                                 struct rx_ring *rx_ring)
 {
-
        /*
         * Allocate the completion queue for this rx_ring.
         */
@@ -3798,7 +3790,6 @@ static int ql_wol(struct ql_adapter *qdev)
 
 static void ql_cancel_all_work_sync(struct ql_adapter *qdev)
 {
-
        /* Don't kill the reset worker thread if we
         * are in the process of recovery.
         */
--

2.25.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/20201015031946.GA16455%40ubuntu204.

Signature · 2 lines
Vaishali
http://vaishalithakkar.in/