diff options
| author |   Tom Lendacky <thomas.lendacky@amd.com> | 2015-05-26 13:06:24 -0500 |
|---|---|---|
| committer |   Herbert Xu <herbert@gondor.apana.org.au> | 2015-05-27 17:51:54 +0800 |
| commit | d921620e03c58bd83c4b345e36a104988d697f0d (patch) | |
| tree | aa59f7f680ef3cfbf1b4afd9e8d1ef60b22081e7 /drivers/crypto/ccp | |
| parent | crypto: jitterentropy - add jitterentropy RNG (diff) | |
| download | linux-dev-d921620e03c58bd83c4b345e36a104988d697f0d.tar.xz linux-dev-d921620e03c58bd83c4b345e36a104988d697f0d.zip | |
crypto: ccp - Remove manual check and set of dma_mask pointer
The underlying device support will set the device dma_mask pointer
if DMA is set up properly for the device. Remove the check for and
assignment of dma_mask when it is null. Instead, just error out if
the dma_set_mask_and_coherent function fails because dma_mask is null.
Signed-off-by: Tom Lendacky <thomas.lendacky@amd.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Diffstat (limited to 'drivers/crypto/ccp')
| -rw-r--r-- | drivers/crypto/ccp/ccp-platform.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/crypto/ccp/ccp-platform.c b/drivers/crypto/ccp/ccp-platform.c index b1c20b2b5647..c0aa5c5c5f9d 100644 --- a/drivers/crypto/ccp/ccp-platform.c +++ b/drivers/crypto/ccp/ccp-platform.c @@ -174,8 +174,6 @@ static int ccp_platform_probe(struct platform_device *pdev) } ccp->io_regs = ccp->io_map; - if (!dev->dma_mask) - dev->dma_mask = &dev->coherent_dma_mask; 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); |