Re: [PATCH] via-velocity: remove null pointer check on array tdinfo->skb_dma

[David Miller]

From: Colin King 
Date: Thu,  8 Sep 2016 10:04:24 +0100

> From: Colin Ian King 
> 
> tdinfo->skb_dma is a 7 element array of dma_addr_t hence cannot be
> null, so the pull pointer check on tdinfo->skb_dma  is redundant.
> Remove it.
> 
> Signed-off-by: Colin Ian King 

Applied, thanks Colin.

Re: [PATCH] via-velocity: remove null pointer check on array tdinfo->skb_dma

[Francois Romieu]

Colin King  :
> From: Colin Ian King 
> 
> tdinfo->skb_dma is a 7 element array of dma_addr_t hence cannot be
> null, so the pull pointer check on tdinfo->skb_dma  is redundant.
> Remove it.
> 
> Signed-off-by: Colin Ian King 

Acked-by: Francois Romieu 

-- 
Ueimor

[PATCH] via-velocity: remove null pointer check on array tdinfo->skb_dma

[Colin King]

From: Colin Ian King 

tdinfo->skb_dma is a 7 element array of dma_addr_t hence cannot be
null, so the pull pointer check on tdinfo->skb_dma  is redundant.
Remove it.

Signed-off-by: Colin Ian King 
---
 drivers/net/ethernet/via/via-velocity.c | 21 +
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/drivers/net/ethernet/via/via-velocity.c 
b/drivers/net/ethernet/via/via-velocity.c
index f38696c..b1167a9 100644
--- a/drivers/net/ethernet/via/via-velocity.c
+++ b/drivers/net/ethernet/via/via-velocity.c
@@ -1724,24 +1724,21 @@ static void velocity_free_tx_buf(struct velocity_info 
*vptr,
struct velocity_td_info *tdinfo, struct tx_desc *td)
 {
struct sk_buff *skb = tdinfo->skb;
+   int i;
 
/*
 *  Don't unmap the pre-allocated tx_bufs
 */
-   if (tdinfo->skb_dma) {
-   int i;
+   for (i = 0; i < tdinfo->nskb_dma; i++) {
+   size_t pktlen = max_t(size_t, skb->len, ETH_ZLEN);
 
-   for (i = 0; i < tdinfo->nskb_dma; i++) {
-   size_t pktlen = max_t(size_t, skb->len, ETH_ZLEN);
+   /* For scatter-gather */
+   if (skb_shinfo(skb)->nr_frags > 0)
+   pktlen = max_t(size_t, pktlen,
+  td->td_buf[i].size & ~TD_QUEUE);
 
-   /* For scatter-gather */
-   if (skb_shinfo(skb)->nr_frags > 0)
-   pktlen = max_t(size_t, pktlen,
-   td->td_buf[i].size & ~TD_QUEUE);
-
-   dma_unmap_single(vptr->dev, tdinfo->skb_dma[i],
-   le16_to_cpu(pktlen), DMA_TO_DEVICE);
-   }
+   dma_unmap_single(vptr->dev, tdinfo->skb_dma[i],
+le16_to_cpu(pktlen), DMA_TO_DEVICE);
}
dev_kfree_skb_irq(skb);
tdinfo->skb = NULL;
-- 
2.9.3