]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
net: macb: Remove dead code
authorShubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Mon, 23 Sep 2019 08:33:51 +0000 (14:03 +0530)
committerDavid S. Miller <davem@davemloft.net>
Wed, 25 Sep 2019 11:59:43 +0000 (13:59 +0200)
macb_64b_desc is always called when HW_DMA_CAP_64B is defined.
So the return NULL can never be reached. Remove the dead code.

Signed-off-by: Shubhrajyoti Datta <shubhrajyoti.datta@xilinx.com>
Reviewed-by: Claudiu Beznea <claudiu.beznea@microchip.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/cadence/macb_main.c

index 35b59b5edf0f2ec653cd0cb21361247e4194a876..8e8d557901a970beea5287cf1ebfaa2ef1910f5b 100644 (file)
@@ -165,9 +165,8 @@ static unsigned int macb_adj_dma_desc_idx(struct macb *bp, unsigned int desc_idx
 #ifdef CONFIG_ARCH_DMA_ADDR_T_64BIT
 static struct macb_dma_desc_64 *macb_64b_desc(struct macb *bp, struct macb_dma_desc *desc)
 {
-       if (bp->hw_dma_cap & HW_DMA_CAP_64B)
-               return (struct macb_dma_desc_64 *)((void *)desc + sizeof(struct macb_dma_desc));
-       return NULL;
+       return (struct macb_dma_desc_64 *)((void *)desc
+               + sizeof(struct macb_dma_desc));
 }
 #endif