Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / drivers / crypto / marvell / cipher.c

diff --git a/drivers/crypto/marvell/cipher.c b/drivers/crypto/marvell/cipher.c
index 8391aba..d19dc96 100644 (file)
--- a/drivers/crypto/marvell/cipher.c
+++ b/drivers/crypto/marvell/cipher.c
@@ -139,20 +139,11 @@ static int mv_cesa_ablkcipher_process(struct crypto_async_request *req,
        struct ablkcipher_request *ablkreq = ablkcipher_request_cast(req);
        struct mv_cesa_ablkcipher_req *creq = ablkcipher_request_ctx(ablkreq);
        struct mv_cesa_req *basereq = &creq->base;
-       unsigned int ivsize;
-       int ret;
 
        if (mv_cesa_req_get_type(basereq) == CESA_STD_REQ)
                return mv_cesa_ablkcipher_std_process(ablkreq, status);
 
-       ret = mv_cesa_dma_process(basereq, status);
-       if (ret)
-               return ret;
-
-       ivsize = crypto_ablkcipher_ivsize(crypto_ablkcipher_reqtfm(ablkreq));
-       memcpy_fromio(ablkreq->info, basereq->chain.last->data, ivsize);
-
-       return 0;
+       return mv_cesa_dma_process(basereq, status);
 }
 
 static void mv_cesa_ablkcipher_step(struct crypto_async_request *req)