diff options
| author | Russell King | 2013-06-27 14:06:28 +0100 |
|---|---|---|
| committer | Russell King | 2013-10-31 14:48:54 +0000 |
| commit | 07f4450c9961b2980dd6485875a374923f0ccb63 (patch) | |
| tree | d708998cc0dff88490e6523785aac2995a7201ad /drivers/mmc | |
| parent | 224ddca0f2f44986214ee8f9e6e0280bf2016655 (diff) | |
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>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/sdhci-acpi.c | 5 |
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) { |