Skip to content

Commit 0044648

Browse files
tititiou36kuba-moo
authored andcommitted
hinic: 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 <[email protected]> Link: https://lore.kernel.org/r/23541c28df8d0dcd3663b5dbe0f76af71e70e9cc.1641743855.git.christophe.jaillet@wanadoo.fr Signed-off-by: Jakub Kicinski <[email protected]>
1 parent e20a471 commit 0044648

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

drivers/net/ethernet/huawei/hinic/hinic_main.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1392,12 +1392,8 @@ static int hinic_probe(struct pci_dev *pdev,
13921392

13931393
err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
13941394
if (err) {
1395-
dev_warn(&pdev->dev, "Couldn't set 64-bit DMA mask\n");
1396-
err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));
1397-
if (err) {
1398-
dev_err(&pdev->dev, "Failed to set DMA mask\n");
1399-
goto err_dma_mask;
1400-
}
1395+
dev_err(&pdev->dev, "Failed to set DMA mask\n");
1396+
goto err_dma_mask;
14011397
}
14021398

14031399
err = nic_dev_init(pdev);

0 commit comments

Comments
 (0)