Merge remote-tracking branch 'iommu/next'

[deliverable/linux.git] / drivers / crypto / omap-aes.c

diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c
index 4ab53a604312668512ff196f03c64e84da153130..3483ab66b1ca91926685a3c35da8138a9842352b 100644 (file)
--- a/drivers/crypto/omap-aes.c
+++ b/drivers/crypto/omap-aes.c
@@ -36,6 +36,7 @@
 #include <crypto/scatterwalk.h>
 #include <crypto/aes.h>
 #include <crypto/algapi.h>
+#include <crypto/engine.h>
 
 #define DST_MAXBURST                   4
 #define DMA_MIN                                (DST_MAXBURST * sizeof(u32))
@@ -519,7 +520,7 @@ static void omap_aes_finish_req(struct omap_aes_dev *dd, int err)
 
        pr_debug("err: %d\n", err);
 
-       crypto_finalize_request(dd->engine, req, err);
+       crypto_finalize_cipher_request(dd->engine, req, err);
 }
 
 static int omap_aes_crypt_dma_stop(struct omap_aes_dev *dd)
@@ -592,7 +593,7 @@ static int omap_aes_handle_queue(struct omap_aes_dev *dd,
                                 struct ablkcipher_request *req)
 {
        if (req)
-               return crypto_transfer_request_to_engine(dd->engine, req);
+               return crypto_transfer_cipher_request_to_engine(dd->engine, req);
 
        return 0;
 }
@@ -1208,8 +1209,8 @@ static int omap_aes_probe(struct platform_device *pdev)
        if (!dd->engine)
                goto err_algs;
 
-       dd->engine->prepare_request = omap_aes_prepare_req;
-       dd->engine->crypt_one_request = omap_aes_crypt_req;
+       dd->engine->prepare_cipher_request = omap_aes_prepare_req;
+       dd->engine->cipher_one_request = omap_aes_crypt_req;
        err = crypto_engine_start(dd->engine);
        if (err)
                goto err_engine;