diff options
| author |   Tudor Ambarus <tudor.ambarus@microchip.com> | 2019-12-13 09:54:54 +0000 |
|---|---|---|
| committer |   Herbert Xu <herbert@gondor.apana.org.au> | 2019-12-20 14:58:35 +0800 |
| commit | e9ce6aee1d4d0ae61bf9e1666d790394c4f4d1a8 (patch) | |
| tree | b3f613858e4027334f5bca5a5d7fac018bc28c6a | |
| parent | crypto: atmel-{aes,sha,tdes} - Stop passing unused argument in _dma_init() (diff) | |
| download | linux-dev-e9ce6aee1d4d0ae61bf9e1666d790394c4f4d1a8.tar.xz linux-dev-e9ce6aee1d4d0ae61bf9e1666d790394c4f4d1a8.zip | |
crypto: atmel-{sha,tdes} - Print warn message even when deferring
Even when deferring, we would like to know what caused it.
Update dev_warn to dev_err because if the DMA init fails,
the probe is stopped.
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | drivers/crypto/atmel-aes.c | 2 | ||||
| -rw-r--r-- | drivers/crypto/atmel-sha.c | 7 | ||||
| -rw-r--r-- | drivers/crypto/atmel-tdes.c | 3 |
3 files changed, 4 insertions, 8 deletions
diff --git a/drivers/crypto/atmel-aes.c b/drivers/crypto/atmel-aes.c index 986f1ca682aa..855f0ccc9368 100644 --- a/drivers/crypto/atmel-aes.c +++ b/drivers/crypto/atmel-aes.c @@ -2292,7 +2292,7 @@ static int atmel_aes_dma_init(struct atmel_aes_dev *dd) err_dma_out: dma_release_channel(dd->src.chan); err_dma_in: - dev_warn(dd->dev, "no DMA channel available\n"); + dev_err(dd->dev, "no DMA channel available\n"); return ret; } diff --git a/drivers/crypto/atmel-sha.c b/drivers/crypto/atmel-sha.c index a0d42bdc311f..e8e4200c1ab3 100644 --- a/drivers/crypto/atmel-sha.c +++ b/drivers/crypto/atmel-sha.c @@ -2485,11 +2485,8 @@ static int atmel_sha_dma_init(struct atmel_sha_dev *dd) { dd->dma_lch_in.chan = dma_request_chan(dd->dev, "tx"); if (IS_ERR(dd->dma_lch_in.chan)) { - int ret = PTR_ERR(dd->dma_lch_in.chan); - - if (ret != -EPROBE_DEFER) - dev_warn(dd->dev, "no DMA channel available\n"); - return ret; + dev_err(dd->dev, "DMA channel is not available\n"); + return PTR_ERR(dd->dma_lch_in.chan); } dd->dma_lch_in.dma_conf.dst_addr = dd->phys_base + diff --git a/drivers/crypto/atmel-tdes.c b/drivers/crypto/atmel-tdes.c index d42b22775ee9..83a6d42c8921 100644 --- a/drivers/crypto/atmel-tdes.c +++ b/drivers/crypto/atmel-tdes.c @@ -783,8 +783,7 @@ static int atmel_tdes_dma_init(struct atmel_tdes_dev *dd) err_dma_out: dma_release_channel(dd->dma_lch_in.chan); err_dma_in: - if (ret != -EPROBE_DEFER) - dev_warn(dd->dev, "no DMA channel available\n"); + dev_err(dd->dev, "no DMA channel available\n"); return ret; } |