crypto: atmel-aes - Retire dma_request_slave_channel_compat()

The driver no longer boots in legacy mode, only via DT. This makes the
dma_request_slave_channel_compat() redundant.
If ever the filter function would be executed it will return false as the
dma_slave is not really initialized.

Switch to use dma_request_chan() which would allow legacy boot if ever
needed again by configuring dma_slave_map for the DMA driver.

At the same time skip allocating memory for dma_slave as it is not used
anymore.

Signed-off-by: Peter Ujfalusi <peter.ujfalusi@ti.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 91092504bc96b43d9d9b8a0928b77af9e790905f..d0da55f0880c8dcedd4a9b0a3d9c949e8ec2b508 100644 (file)
--- a/drivers/crypto/atmel-aes.c
+++ b/drivers/crypto/atmel-aes.c
@@ -38,7 +38,6 @@
 #include <crypto/internal/aead.h>
 #include <crypto/internal/skcipher.h>
 #include <linux/platform_data/crypto-atmel.h>
-#include <dt-bindings/dma/at91.h>
 #include "atmel-aes-regs.h"
 #include "atmel-authenc.h"
 
@@ -2364,39 +2363,23 @@ static void atmel_aes_buff_cleanup(struct atmel_aes_dev *dd)
        free_page((unsigned long)dd->buf);
 }
 
-static bool atmel_aes_filter(struct dma_chan *chan, void *slave)
-{
-       struct at_dma_slave     *sl = slave;
-
-       if (sl && sl->dma_dev == chan->device->dev) {
-               chan->private = sl;
-               return true;
-       } else {
-               return false;
-       }
-}
-
 static int atmel_aes_dma_init(struct atmel_aes_dev *dd,
                              struct crypto_platform_data *pdata)
 {
-       struct at_dma_slave *slave;
-       dma_cap_mask_t mask;
-
-       dma_cap_zero(mask);
-       dma_cap_set(DMA_SLAVE, mask);
+       int ret;
 
        /* Try to grab 2 DMA channels */
-       slave = &pdata->dma_slave->rxdata;
-       dd->src.chan = dma_request_slave_channel_compat(mask, atmel_aes_filter,
-                                                       slave, dd->dev, "tx");
-       if (!dd->src.chan)
+       dd->src.chan = dma_request_chan(dd->dev, "tx");
+       if (IS_ERR(dd->src.chan)) {
+               ret = PTR_ERR(dd->src.chan);
                goto err_dma_in;
+       }
 
-       slave = &pdata->dma_slave->txdata;
-       dd->dst.chan = dma_request_slave_channel_compat(mask, atmel_aes_filter,
-                                                       slave, dd->dev, "rx");
-       if (!dd->dst.chan)
+       dd->dst.chan = dma_request_chan(dd->dev, "rx");
+       if (IS_ERR(dd->dst.chan)) {
+               ret = PTR_ERR(dd->dst.chan);
                goto err_dma_out;
+       }
 
        return 0;
 
@@ -2404,7 +2387,7 @@ err_dma_out:
        dma_release_channel(dd->src.chan);
 err_dma_in:
        dev_warn(dd->dev, "no DMA channel available\n");
-       return -ENODEV;
+       return ret;
 }
 
 static void atmel_aes_dma_cleanup(struct atmel_aes_dev *dd)
@@ -2592,14 +2575,6 @@ static struct crypto_platform_data *atmel_aes_of_init(struct platform_device *pd
        if (!pdata)
                return ERR_PTR(-ENOMEM);
 
-       pdata->dma_slave = devm_kzalloc(&pdev->dev,
-                                       sizeof(*(pdata->dma_slave)),
-                                       GFP_KERNEL);
-       if (!pdata->dma_slave) {
-               devm_kfree(&pdev->dev, pdata);
-               return ERR_PTR(-ENOMEM);
-       }
-
        return pdata;
 }
 #else
@@ -2626,11 +2601,6 @@ static int atmel_aes_probe(struct platform_device *pdev)
                }
        }
 
-       if (!pdata->dma_slave) {
-               err = -ENXIO;
-               goto aes_dd_err;
-       }
-
        aes_dd = devm_kzalloc(&pdev->dev, sizeof(*aes_dd), GFP_KERNEL);
        if (aes_dd == NULL) {
                err = -ENOMEM;