Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 05:02:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

crypto: atmel-{sha,tdes} - Print warn message even when deferring

Browse Source 
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>
This commit is contained in:
Tudor Ambarus 2019-12-13 09:54:54 +00:00 committed by Herbert Xu
parent 827a98df67
commit e9ce6aee1d
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/crypto/atmel-aes.c
View File

@ -2292,7 +2292,7 @@ static int atmel_aes_dma_init(struct atmel_aes_dev *dd)
err_dma_out: err_dma_out:
dma_release_channel(dd->src.chan); dma_release_channel(dd->src.chan);
err_dma_in: err_dma_in:
dev_warn(dd->dev, "no DMA channel available\n"); dev_err(dd->dev, "no DMA channel available\n");
return ret; return ret;
} }

7
drivers/crypto/atmel-sha.c
View File

@ -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"); dd->dma_lch_in.chan = dma_request_chan(dd->dev, "tx");
if (IS_ERR(dd->dma_lch_in.chan)) { if (IS_ERR(dd->dma_lch_in.chan)) {
int ret = PTR_ERR(dd->dma_lch_in.chan); dev_err(dd->dev, "DMA channel is not available\n");
return PTR_ERR(dd->dma_lch_in.chan);
if (ret != -EPROBE_DEFER)
dev_warn(dd->dev, "no DMA channel available\n");
return ret;
} }
dd->dma_lch_in.dma_conf.dst_addr = dd->phys_base + dd->dma_lch_in.dma_conf.dst_addr = dd->phys_base +

3
drivers/crypto/atmel-tdes.c
View File

@ -783,8 +783,7 @@ static int atmel_tdes_dma_init(struct atmel_tdes_dev *dd)
err_dma_out: err_dma_out:
dma_release_channel(dd->dma_lch_in.chan); dma_release_channel(dd->dma_lch_in.chan);
err_dma_in: err_dma_in:
if (ret != -EPROBE_DEFER) dev_err(dd->dev, "no DMA channel available\n");
dev_warn(dd->dev, "no DMA channel available\n");
return ret; return ret;
} }