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: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/ata/pata_octeon_cf.c b/drivers/ata/pata_octeon_cf.c
index c51bbb9ea8e8..83c4ddb1bc7f 100644
--- a/drivers/ata/pata_octeon_cf.c
+++ b/drivers/ata/pata_octeon_cf.c
@@ -1014,8 +1014,9 @@ static int octeon_cf_probe(struct platform_device *pdev)
         }
         cf_port->c0 = ap->ioaddr.ctl_addr;
 
-        pdev->dev.coherent_dma_mask = DMA_BIT_MASK(64);
-        pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask;
+        rv = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64));
+        if (rv)
+                return rv;
 
         ata_port_desc(ap, "cmd %p ctl %p", base, ap->ioaddr.ctl_addr);