From patchwork Wed May 18 09:21:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 9117541 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: X-Original-To: patchwork-linux-crypto@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 73F70BF29F for ; Wed, 18 May 2016 09:22:13 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 95F4420279 for ; Wed, 18 May 2016 09:22:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id BA67F2022D for ; Wed, 18 May 2016 09:22:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753042AbcERJVj (ORCPT ); Wed, 18 May 2016 05:21:39 -0400 Received: from mail-wm0-f67.google.com ([74.125.82.67]:35590 "EHLO mail-wm0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750870AbcERJVh (ORCPT ); Wed, 18 May 2016 05:21:37 -0400 Received: by mail-wm0-f67.google.com with SMTP id g17so4611412wme.2; Wed, 18 May 2016 02:21:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=F9+5qKi9c4jpk39sDArzas3CBc6jOfgzvwBQdWfS/3g=; b=TjG2kT5uVuVx9o86IbGa/njun57kkEI/Rp8t2Cp+L+ydIAbmczHV6zJ0DfLqdSyCHv nk5k7lqM42fmGKpvMqA/7fXcVhvSPg4v4LGFKaBW/G5O6tLw1k/l3jrhcfJ5vcG2inGu XzcP0VT6uYlg8rm4BjniAb6oRPrNbL8gi1Ab/MVYgfVtJfEPm5jGD1QK7Y7hGOr1+N3o Ji+ILmCR9xCLPaWxEXk6Wav4baGYR4LHMSOU6ewPEPfXPc9owjSNLjKZOO25DGwmAJsy a91fMrZIJoQ4p78Du3mnlObRh/NCPyUD1+JvGtjzOacNdjKpYKVnaE9zBpQImrUCVRbi ouUw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=F9+5qKi9c4jpk39sDArzas3CBc6jOfgzvwBQdWfS/3g=; b=NkCEVsOYx6lW0emmizLzX1Vg9eDUJ0K/9d4wr/XQL+4VsBgvo5UJooIEOWfAvVaBSK /OCyvy0GPaG9Hy/oqv8I6799Y/YazUzZxHup2gQRA3p9C/eP18Df+TBVXHQ6YJaYJDF/ ouU+LAbGigCrSAUH0VGz12RNIavBSFECDYHeOfPyDjXUM6DJ9o9e95Ubp50WB/O3lz2Z +2pFBFZOwfZFJRlEKRoFEwlPIN9F0jA00Sop2rRROUUwkHyEkTKOFMDd0n8f42bNAXt9 W2jD6XCGCzLevKfrHM88cu0lIVZ0/BbE4WDxtvkOuVUpqUV8ajK+eUJqwCNV+JtOFvHr /Z6A== X-Gm-Message-State: AOPr4FUBBwNZ/aF1LcP9zYnYOgvw86uc6YeO4FSe2giumczzOgH+Df3CrrYVxAc5eZynRw== X-Received: by 10.28.56.132 with SMTP id f126mr3350100wma.96.1463563296380; Wed, 18 May 2016 02:21:36 -0700 (PDT) Received: from Red.local (ANice-651-1-331-22.w86-205.abo.wanadoo.fr. [86.205.3.22]) by smtp.googlemail.com with ESMTPSA id gk6sm7566235wjc.31.2016.05.18.02.21.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 18 May 2016 02:21:35 -0700 (PDT) From: LABBE Corentin To: baolin.wang@linaro.org, herbert@gondor.apana.org.au, davem@davemloft.net Cc: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, LABBE Corentin Subject: [PATCH 2/2] crypto: omap: convert to the new cryptoengine API Date: Wed, 18 May 2016 11:21:25 +0200 Message-Id: <1463563285-11742-3-git-send-email-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1463563285-11742-1-git-send-email-clabbe.montjoie@gmail.com> References: <1463563285-11742-1-git-send-email-clabbe.montjoie@gmail.com> Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Spam-Status: No, score=-8.2 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Since the crypto engine has been converted to use crypto_async_request instead of ablkcipher_request, minor changes are needed to use it. Signed-off-by: LABBE Corentin --- drivers/crypto/omap-aes.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/omap-aes.c b/drivers/crypto/omap-aes.c index d420ec7..1368ab1 100644 --- a/drivers/crypto/omap-aes.c +++ b/drivers/crypto/omap-aes.c @@ -530,7 +530,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_request(dd->engine, &req->base, err); } static int omap_aes_crypt_dma_stop(struct omap_aes_dev *dd) @@ -603,14 +603,15 @@ 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_request_to_engine(dd->engine, &req->base); return 0; } static int omap_aes_prepare_req(struct crypto_engine *engine, - struct ablkcipher_request *req) + struct crypto_async_request *areq) { + struct ablkcipher_request *req = ablkcipher_request_cast(areq); struct omap_aes_ctx *ctx = crypto_ablkcipher_ctx( crypto_ablkcipher_reqtfm(req)); struct omap_aes_dev *dd = omap_aes_find_dev(ctx); @@ -653,8 +654,9 @@ static int omap_aes_prepare_req(struct crypto_engine *engine, } static int omap_aes_crypt_req(struct crypto_engine *engine, - struct ablkcipher_request *req) + struct crypto_async_request *areq) { + struct ablkcipher_request *req = ablkcipher_request_cast(areq); struct omap_aes_ctx *ctx = crypto_ablkcipher_ctx( crypto_ablkcipher_reqtfm(req)); struct omap_aes_dev *dd = omap_aes_find_dev(ctx);