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>

diff --git a/drivers/crypto/atmel-aes.c b/drivers/crypto/atmel-aes.c
index 986f1ca..855f0cc 100644 (file)
--- 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 a0d42bd..e8e4200 100644 (file)
--- 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 d42b227..83a6d42 100644 (file)
--- 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;
 }