From: Tom Lendacky <thomas.lendacky@amd.com>
Date: Tue, 3 Feb 2015 19:07:17 +0000 (-0600)
Subject: crypto: ccp - Use dma_set_mask_and_coherent to set DMA mask
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=261bf074899a1a4624d8a0c6bfae3e92d12ef19f;p=openwrt%2Fstaging%2Fblogic.git

crypto: ccp - Use dma_set_mask_and_coherent to set DMA mask

Replace the setting of the DMA masks with the dma_set_mask_and_coherent
function call.

Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
---

diff --git a/drivers/crypto/ccp/ccp-platform.c b/drivers/crypto/ccp/ccp-platform.c
index 9e09c5023b5f..04265a3c3608 100644
--- a/drivers/crypto/ccp/ccp-platform.c
+++ b/drivers/crypto/ccp/ccp-platform.c
@@ -109,8 +109,11 @@ static int ccp_platform_probe(struct platform_device *pdev)
 
 	if (!dev->dma_mask)
 		dev->dma_mask = &dev->coherent_dma_mask;
-	*(dev->dma_mask) = DMA_BIT_MASK(48);
-	dev->coherent_dma_mask = DMA_BIT_MASK(48);
+	ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(48));
+	if (ret) {
+		dev_err(dev, "dma_set_mask_and_coherent failed (%d)\n", ret);
+		goto e_free;
+	}
 
 	if (of_property_read_bool(dev->of_node, "dma-coherent"))
 		ccp->axcache = CACHE_WB_NO_ALLOC;