Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+3 -2
+3 -2
drivers/ata/pata_octeon_cf.c
··· 1014 1014 } 1015 1015 cf_port->c0 = ap->ioaddr.ctl_addr; 1016 1016 1017 - pdev->dev.coherent_dma_mask = DMA_BIT_MASK(64); 1018 - pdev->dev.dma_mask = &pdev->dev.coherent_dma_mask; 1017 + rv = dma_coerce_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(64)); 1018 + if (rv) 1019 + return rv; 1019 1020 1020 1021 ata_port_desc(ap, "cmd %p ctl %p", base, ap->ioaddr.ctl_addr); 1021 1022