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

Commit 1bfa2c40 authored by Russell King's avatar Russell King
Browse files

DMA-API: net: broadcom/bnx2x: 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().

Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 4011f9f7

drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c

+2 −6
Original line number Diff line number Diff line
@@ -12072,13 +12072,9 @@ static int bnx2x_set_coherency_mask(struct bnx2x *bp) 
{

	struct device *dev = &bp->pdev->dev;



	if (dma_set_mask(dev, DMA_BIT_MASK(64)) == 0) {

	if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64)) == 0) {

		bp->flags |= USING_DAC_FLAG;

		if (dma_set_coherent_mask(dev, DMA_BIT_MASK(64)) != 0) {

			dev_err(dev, "dma_set_coherent_mask failed, aborting\n");

			return -EIO;

		}

	} else if (dma_set_mask(dev, DMA_BIT_MASK(32)) != 0) {

	} else if (dma_set_mask_and_coherent(dev, DMA_BIT_MASK(32)) != 0) {

		dev_err(dev, "System does not support DMA, aborting\n");

		return -EIO;

	}