浏览代码

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>
Tom Lendacky 10 年之前
父节点
当前提交
261bf07489
共有 1 个文件被更改,包括 5 次插入2 次删除
  1. 5 2
      drivers/crypto/ccp/ccp-platform.c

+ 5 - 2
drivers/crypto/ccp/ccp-platform.c

@@ -109,8 +109,11 @@ static int ccp_platform_probe(struct platform_device *pdev)
 
 
 	if (!dev->dma_mask)
 	if (!dev->dma_mask)
 		dev->dma_mask = &dev->coherent_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"))
 	if (of_property_read_bool(dev->of_node, "dma-coherent"))
 		ccp->axcache = CACHE_WB_NO_ALLOC;
 		ccp->axcache = CACHE_WB_NO_ALLOC;