Commit 00446483 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Jakub Kicinski
Browse files

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: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Link: https://lore.kernel.org/r/23541c28df8d0dcd3663b5dbe0f76af71e70e9cc.1641743855.git.christophe.jaillet@wanadoo.fr


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent e20a4712

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

+2 −6
Original line number Diff line number Diff line
@@ -1391,14 +1391,10 @@ static int hinic_probe(struct pci_dev *pdev, 
	pci_set_master(pdev);



	err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

	if (err) {

		dev_warn(&pdev->dev, "Couldn't set 64-bit DMA mask\n");

		err = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));

	if (err) {

		dev_err(&pdev->dev, "Failed to set DMA mask\n");

		goto err_dma_mask;

	}

	}



	err = nic_dev_init(pdev);

	if (err) {