Commit c5180ad0 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by David S. Miller
Browse files

enic: Use dma_set_mask_and_coherent() 



Use dma_set_mask_and_coherent() instead of unrolling it with some
dma_set_mask()+dma_set_coherent_mask().

This simplifies code and removes some dead code (dma_set_coherent_mask()
can not fail after a successful dma_set_mask())

Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e44ef1d4

drivers/net/ethernet/cisco/enic/enic_main.c

+2 −14
Original line number Diff line number Diff line
@@ -2718,26 +2718,14 @@ static int enic_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	 * fail to 32-bit.

	 */



	err = dma_set_mask(&pdev->dev, DMA_BIT_MASK(47));

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

	if (err) {

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

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

		if (err) {

			dev_err(dev, "No usable DMA configuration, aborting\n");

			goto err_out_release_regions;

		}

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

		if (err) {

			dev_err(dev, "Unable to obtain %u-bit DMA "

				"for consistent allocations, aborting\n", 32);

			goto err_out_release_regions;

		}

	} else {

		err = dma_set_coherent_mask(&pdev->dev, DMA_BIT_MASK(47));

		if (err) {

			dev_err(dev, "Unable to obtain %u-bit DMA "

				"for consistent allocations, aborting\n", 47);

			goto err_out_release_regions;

		}

		using_dac = 1;

	}