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

Commit 51872b66 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

sata_nv: use dma_set_mask_and_coherent 



Use the dma_set_mask_and_coherent helper to set the DMA mask.  Rely
on the relatively recent change that setting a larger than required
mask will never fail to avoid the need for the boilerplate 32-bit
fallback code.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 496d4575

drivers/ata/sata_nv.c

+3 −7
Original line number Diff line number Diff line
@@ -1122,14 +1122,10 @@ static int nv_adma_port_start(struct ata_port *ap) 


	/*

	 * Now that the legacy PRD and padding buffer are allocated we can

	 * try to raise the DMA mask to allocate the CPB/APRD table.

	 * raise the DMA mask to allocate the CPB/APRD table.

	 */

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

	if (rc) {

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

		if (rc)

			return rc;

	}

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



	pp->adma_dma_mask = *dev->dma_mask;



	mem = dmam_alloc_coherent(dev, NV_ADMA_PORT_PRIV_DMA_SZ,