From: Russell King Date: Thu, 27 Jun 2013 13:06:28 +0000 (+0100) Subject: DMA-API: mmc: sdhci-acpi: use dma_coerce_mask_and_coherent() X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=07f4450c9961b2980dd6485875a374923f0ccb63;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git DMA-API: mmc: sdhci-acpi: use dma_coerce_mask_and_coherent() The code sequence: dev->dma_mask = &dev->coherent_dma_mask; dev->coherent_dma_mask = dma_mask; bypasses the architectures check on the DMA mask. It can be replaced with dma_coerce_mask_and_coherent(), avoiding the direct initialization of this mask. Signed-off-by: Russell King --- diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c index cdd4ce0d7c90..ef19874fcd1f 100644 --- a/drivers/mmc/host/sdhci-acpi.c +++ b/drivers/mmc/host/sdhci-acpi.c @@ -310,8 +310,9 @@ static int sdhci_acpi_probe(struct platform_device *pdev) dma_mask = DMA_BIT_MASK(32); } - dev->dma_mask = &dev->coherent_dma_mask; - dev->coherent_dma_mask = dma_mask; + err = dma_coerce_mask_and_coherent(dev, dma_mask); + if (err) + goto err_free; } if (c->slot) {