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

Commit 105f4ade authored by Russell King's avatar Russell King
Browse files

DMA-API: ata: pata_octeon_cf: convert to use dma_coerce_mask_and_coherent() 



Convert this code sequence:
	pdev->dev.coherent_dma_mask = DMA_BIT_MASK(64);
	pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
to use dma_coerce_mask_and_coherent() to avoid bypassing the architecture
check on the DMA mask.

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

drivers/ata/pata_octeon_cf.c

+3 −2
Original line number Original line Diff line number Diff line
@@ -1014,8 +1014,9 @@ static int octeon_cf_probe(struct platform_device *pdev) 
	}

	}

	cf_port->c0 = ap->ioaddr.ctl_addr;

	cf_port->c0 = ap->ioaddr.ctl_addr;





	pdev->dev.coherent_dma_mask = DMA_BIT_MASK(64);

	rv = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));

	pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;

	if (rv)

		return rv;





	ata_port_desc(ap, "cmd %p ctl %p", base, ap->ioaddr.ctl_addr);

	ata_port_desc(ap, "cmd %p ctl %p", base, ap->ioaddr.ctl_addr);