staging: vt6655: dead code tx path remove dma_unmap_single
authorMalcolm Priestley <tvboxspy@gmail.com>
Wed, 22 Jul 2015 18:16:35 +0000 (19:16 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 23 Jul 2015 03:51:37 +0000 (20:51 -0700)
When pTDInfo->skb_dma not equal to pTDInfo->buf_dma, pTDInfo->skb_dma
equals zero.

as mentioned in comment pre-allocated buf_dma can't be unmapped
so remove dead code.

Signed-off-by: Malcolm Priestley <tvboxspy@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/vt6655/device_main.c

index 053291a8e844803ae48027f7ddb7aaf5f877be33..695aa25e819d6b280db5dc6d03ab1c2d17b65170 100644 (file)
@@ -754,10 +754,6 @@ static void device_free_td0_ring(struct vnt_private *pDevice)
                PSTxDesc        pDesc = &(pDevice->apTD0Rings[i]);
                PDEVICE_TD_INFO  pTDInfo = pDesc->pTDInfo;
 
-               if (pTDInfo->skb_dma && (pTDInfo->skb_dma != pTDInfo->buf_dma))
-                       dma_unmap_single(&pDevice->pcid->dev, pTDInfo->skb_dma,
-                                        pTDInfo->skb->len, DMA_TO_DEVICE);
-
                dev_kfree_skb(pTDInfo->skb);
                kfree(pDesc->pTDInfo);
        }
@@ -771,10 +767,6 @@ static void device_free_td1_ring(struct vnt_private *pDevice)
                PSTxDesc        pDesc = &(pDevice->apTD1Rings[i]);
                PDEVICE_TD_INFO  pTDInfo = pDesc->pTDInfo;
 
-               if (pTDInfo->skb_dma && (pTDInfo->skb_dma != pTDInfo->buf_dma))
-                       dma_unmap_single(&pDevice->pcid->dev, pTDInfo->skb_dma,
-                                        pTDInfo->skb->len, DMA_TO_DEVICE);
-
                dev_kfree_skb(pTDInfo->skb);
                kfree(pDesc->pTDInfo);
        }
@@ -975,12 +967,6 @@ static void device_free_tx_buf(struct vnt_private *pDevice, PSTxDesc pDesc)
        PDEVICE_TD_INFO  pTDInfo = pDesc->pTDInfo;
        struct sk_buff *skb = pTDInfo->skb;
 
-       /* pre-allocated buf_dma can't be unmapped. */
-       if (pTDInfo->skb_dma && (pTDInfo->skb_dma != pTDInfo->buf_dma)) {
-               dma_unmap_single(&pDevice->pcid->dev, pTDInfo->skb_dma,
-                                skb->len, DMA_TO_DEVICE);
-       }
-
        if (skb)
                ieee80211_tx_status_irqsafe(pDevice->hw, skb);