From e20a471256b0adccfa6b61aa12c4888abb542320 Mon Sep 17 00:00:00 2001 From: Christophe JAILLET Date: Sun, 9 Jan 2022 16:50:19 +0100 Subject: lan743x: Remove useless DMA-32 fallback configuration As stated in [1], dma_set_mask() with a 64-bit mask never fails if dev->dma_mask is non-NULL. So, if it fails, the 32 bits case will also fail for the same reason. Simplify code and remove some dead code accordingly. [1]: https://lkml.org/lkml/2021/6/7/398 Signed-off-by: Christophe JAILLET Link: https://lore.kernel.org/r/ef548716606f257939df9738a801f15b6edf2568.1641743405.git.christophe.jaillet@wanadoo.fr Signed-off-by: Jakub Kicinski --- drivers/net/ethernet/microchip/lan743x_main.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'drivers/net/ethernet') diff --git a/drivers/net/ethernet/microchip/lan743x_main.c b/drivers/net/ethernet/microchip/lan743x_main.c index 7d7647481f70..8c6390d95158 100644 --- a/drivers/net/ethernet/microchip/lan743x_main.c +++ b/drivers/net/ethernet/microchip/lan743x_main.c @@ -1739,13 +1739,10 @@ static int lan743x_tx_ring_init(struct lan743x_tx *tx) } if (dma_set_mask_and_coherent(&tx->adapter->pdev->dev, DMA_BIT_MASK(64))) { - if (dma_set_mask_and_coherent(&tx->adapter->pdev->dev, - DMA_BIT_MASK(32))) { - dev_warn(&tx->adapter->pdev->dev, - "lan743x_: No suitable DMA available\n"); - ret = -ENOMEM; - goto cleanup; - } + dev_warn(&tx->adapter->pdev->dev, + "lan743x_: No suitable DMA available\n"); + ret = -ENOMEM; + goto cleanup; } ring_allocation_size = ALIGN(tx->ring_size * sizeof(struct lan743x_tx_descriptor), @@ -2284,13 +2281,10 @@ static int lan743x_rx_ring_init(struct lan743x_rx *rx) } if (dma_set_mask_and_coherent(&rx->adapter->pdev->dev, DMA_BIT_MASK(64))) { - if (dma_set_mask_and_coherent(&rx->adapter->pdev->dev, - DMA_BIT_MASK(32))) { - dev_warn(&rx->adapter->pdev->dev, - "lan743x_: No suitable DMA available\n"); - ret = -ENOMEM; - goto cleanup; - } + dev_warn(&rx->adapter->pdev->dev, + "lan743x_: No suitable DMA available\n"); + ret = -ENOMEM; + goto cleanup; } ring_allocation_size = ALIGN(rx->ring_size * sizeof(struct lan743x_rx_descriptor), -- cgit v1.2.3