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

1 files changed, 3 insertions, 2 deletions

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) {