Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9663deda authored by Russell King's avatar Russell King
Browse files

DMA-API: net: sfc/efx.c: replace dma_set_mask()+dma_set_coherent_mask() with new helper 



Replace the following sequence:

	dma_set_mask(dev, mask);
	dma_set_coherent_mask(dev, mask);

with a call to the new helper dma_set_mask_and_coherent().

Acked-by: default avatarBen Hutchings <bhutchings@solarflare.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 9931a26e

drivers/net/ethernet/sfc/efx.c

+1 −11
Original line number Original line Diff line number Diff line
@@ -1121,7 +1121,7 @@ static int efx_init_io(struct efx_nic *efx) 
	 */

	 */

	while (dma_mask > 0x7fffffffUL) {

	while (dma_mask > 0x7fffffffUL) {

		if (dma_supported(&pci_dev->dev, dma_mask)) {

		if (dma_supported(&pci_dev->dev, dma_mask)) {

			rc = dma_set_mask(&pci_dev->dev, dma_mask);

			rc = dma_set_mask_and_coherent(&pci_dev->dev, dma_mask);

			if (rc == 0)

			if (rc == 0)

				break;

				break;

		}

		}
@@ -1134,16 +1134,6 @@ static int efx_init_io(struct efx_nic *efx) 
	}

	}

	netif_dbg(efx, probe, efx->net_dev,

	netif_dbg(efx, probe, efx->net_dev,

		  "using DMA mask %llx\n", (unsigned long long) dma_mask);

		  "using DMA mask %llx\n", (unsigned long long) dma_mask);

	rc = dma_set_coherent_mask(&pci_dev->dev, dma_mask);

	if (rc) {

		/* dma_set_coherent_mask() is not *allowed* to

		 * fail with a mask that dma_set_mask() accepted,

		 * but just in case...

		 */

		netif_err(efx, probe, efx->net_dev,

			  "failed to set consistent DMA mask\n");

		goto fail2;

	}





	efx->membase_phys = pci_resource_start(efx->pci_dev, EFX_MEM_BAR);

	efx->membase_phys = pci_resource_start(efx->pci_dev, EFX_MEM_BAR);

	rc = pci_request_region(pci_dev, EFX_MEM_BAR, "sfc");

	rc = pci_request_region(pci_dev, EFX_MEM_BAR, "sfc");