From patchwork Tue May 23 12:09:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Corentin Labbe X-Patchwork-Id: 9742403 X-Patchwork-Delegate: herbert@gondor.apana.org.au Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 44138601C2 for ; Tue, 23 May 2017 12:11:13 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2CCEC237A5 for ; Tue, 23 May 2017 12:11:13 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 218D5287CE; Tue, 23 May 2017 12:11:13 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A91B3237A5 for ; Tue, 23 May 2017 12:11:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936225AbdEWMLK (ORCPT ); Tue, 23 May 2017 08:11:10 -0400 Received: from mail-wm0-f66.google.com ([74.125.82.66]:36508 "EHLO mail-wm0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S936053AbdEWMLJ (ORCPT ); Tue, 23 May 2017 08:11:09 -0400 Received: by mail-wm0-f66.google.com with SMTP id k15so37653613wmh.3; Tue, 23 May 2017 05:11:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=4HPiK+0Lp3X9l5DymZSuo11ce0JdCs82wUXmVamIlHY=; b=XaP7dENSYyLhx6KZukdWMZfRItZw2W/GoBHatrD1WLObK5z1VSDECY0U88Mh0GTUAo O6XfUA6W8XXWBGF1FR+EoGfnUgzSHeA8QFMdU91HA7ufUHuK8S6CEIKm7eWCDuXKcNP1 X8FfhuMhwdP2Ksb8DeFyithTzQqy1qIDNfNkcjY5AnXOBewVBMGuyaLMMCxUuxIu5abv Va9eg1YEtMeZjJY6IEOXTia17lkT0g1cvtIMo2MCLBnrg42hQLWPu5f3T7ARB0Z97kxb AeQxLqZCPNGKlet3k/P0m9JEpj1tqcBzL6z9flP/40lSzhCkmM8C3rgeU1jH7dtyZsw5 Q+QA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=4HPiK+0Lp3X9l5DymZSuo11ce0JdCs82wUXmVamIlHY=; b=UPsFO1E6tRBHjjwsezcoUIVWlXzdNGeN/LhXJlj9daqZagMSE6dIpTXaa2Nk8izoCj fvYdJ8JWf9MoWuy6+TH+cGVS+KS33UZ6ShfEXo/037exyd8xqhNp4dA6+9+ga8qBVumc DyYyUt4iueLrhnsRWrv/2a0SdmTvYBXzqlWMQXKfkfH3HzVXHUifngZ+sUxJgTtPoD/c xp8F8ypRx7MRONgttPqQXuVDFuIthL+CO7uzRuR5KCv9yogz2WxoHxrJsKFQ102E5mNv VXLIkU1Krhw05/MTivMS3xJc6bRks+BuI6OrRsZkpmjenDQ0KOyZAnLwQH65sUrKxnFm oO9w== X-Gm-Message-State: AODbwcBl+40gp97FYb7RVSw7SdZC9sEl1BJRoIhp++o6qUV4TwpHWgAh ak806FZJZxS5rA== X-Received: by 10.28.92.135 with SMTP id q129mr2129243wmb.109.1495541467794; Tue, 23 May 2017 05:11:07 -0700 (PDT) Received: from Red.local (LFbn-1-7035-57.w90-116.abo.wanadoo.fr. [90.116.208.57]) by smtp.googlemail.com with ESMTPSA id l27sm768364wrb.65.2017.05.23.05.11.06 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 23 May 2017 05:11:07 -0700 (PDT) From: Corentin Labbe To: herbert@gondor.apana.org.au, davem@davemloft.net Cc: linux-crypto@vger.kernel.org, linux-kernel@vger.kernel.org, Corentin Labbe Subject: [PATCH 1/2] crypto: engine - replace pr_xxx by dev_xxx Date: Tue, 23 May 2017 14:09:02 +0200 Message-Id: <20170523120903.31637-1-clabbe.montjoie@gmail.com> X-Mailer: git-send-email 2.13.0 Sender: linux-crypto-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP By adding a struct device *dev to struct engine, we could store the device used at register time and so use all dev_xxx functions instead of pr_xxx. Signed-off-by: Corentin Labbe --- crypto/crypto_engine.c | 23 +++++++++++++---------- include/crypto/engine.h | 1 + 2 files changed, 14 insertions(+), 10 deletions(-) diff --git a/crypto/crypto_engine.c b/crypto/crypto_engine.c index 727bd5c3569e..61e7c4e02fd2 100644 --- a/crypto/crypto_engine.c +++ b/crypto/crypto_engine.c @@ -70,7 +70,7 @@ static void crypto_pump_requests(struct crypto_engine *engine, if (engine->unprepare_crypt_hardware && engine->unprepare_crypt_hardware(engine)) - pr_err("failed to unprepare crypt hardware\n"); + dev_err(engine->dev, "failed to unprepare crypt hardware\n"); spin_lock_irqsave(&engine->queue_lock, flags); engine->idling = false; @@ -99,7 +99,7 @@ static void crypto_pump_requests(struct crypto_engine *engine, if (!was_busy && engine->prepare_crypt_hardware) { ret = engine->prepare_crypt_hardware(engine); if (ret) { - pr_err("failed to prepare crypt hardware\n"); + dev_err(engine->dev, "failed to prepare crypt hardware\n"); goto req_err; } } @@ -110,14 +110,15 @@ static void crypto_pump_requests(struct crypto_engine *engine, if (engine->prepare_hash_request) { ret = engine->prepare_hash_request(engine, hreq); if (ret) { - pr_err("failed to prepare request: %d\n", ret); + dev_err(engine->dev, "failed to prepare request: %d\n", + ret); goto req_err; } engine->cur_req_prepared = true; } ret = engine->hash_one_request(engine, hreq); if (ret) { - pr_err("failed to hash one request from queue\n"); + dev_err(engine->dev, "failed to hash one request from queue\n"); goto req_err; } return; @@ -126,19 +127,20 @@ static void crypto_pump_requests(struct crypto_engine *engine, if (engine->prepare_cipher_request) { ret = engine->prepare_cipher_request(engine, breq); if (ret) { - pr_err("failed to prepare request: %d\n", ret); + dev_err(engine->dev, "failed to prepare request: %d\n", + ret); goto req_err; } engine->cur_req_prepared = true; } ret = engine->cipher_one_request(engine, breq); if (ret) { - pr_err("failed to cipher one request from queue\n"); + dev_err(engine->dev, "failed to cipher one request from queue\n"); goto req_err; } return; default: - pr_err("failed to prepare request of unknown type\n"); + dev_err(engine->dev, "failed to prepare request of unknown type\n"); return; } @@ -275,7 +277,7 @@ void crypto_finalize_cipher_request(struct crypto_engine *engine, engine->unprepare_cipher_request) { ret = engine->unprepare_cipher_request(engine, req); if (ret) - pr_err("failed to unprepare request\n"); + dev_err(engine->dev, "failed to unprepare request\n"); } spin_lock_irqsave(&engine->queue_lock, flags); engine->cur_req = NULL; @@ -312,7 +314,7 @@ void crypto_finalize_hash_request(struct crypto_engine *engine, engine->unprepare_hash_request) { ret = engine->unprepare_hash_request(engine, req); if (ret) - pr_err("failed to unprepare request\n"); + dev_err(engine->dev, "failed to unprepare request\n"); } spin_lock_irqsave(&engine->queue_lock, flags); engine->cur_req = NULL; @@ -384,7 +386,7 @@ int crypto_engine_stop(struct crypto_engine *engine) spin_unlock_irqrestore(&engine->queue_lock, flags); if (ret) - pr_warn("could not stop engine\n"); + dev_warn(engine->dev, "could not stop engine\n"); return ret; } @@ -411,6 +413,7 @@ struct crypto_engine *crypto_engine_alloc_init(struct device *dev, bool rt) if (!engine) return NULL; + engine->dev = dev; engine->rt = rt; engine->running = false; engine->busy = false; diff --git a/include/crypto/engine.h b/include/crypto/engine.h index 1bf600fc99f7..9e968a1033d0 100644 --- a/include/crypto/engine.h +++ b/include/crypto/engine.h @@ -58,6 +58,7 @@ struct crypto_engine { struct list_head list; spinlock_t queue_lock; struct crypto_queue queue; + struct device *dev; bool rt;