From patchwork Mon Sep 12 19:27:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 9327919 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 386A86077F for ; Mon, 12 Sep 2016 19:36:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2B41F28D8A for ; Mon, 12 Sep 2016 19:36:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 202BC28E6F; Mon, 12 Sep 2016 19:36:56 +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.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID 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 B9FB328D8A for ; Mon, 12 Sep 2016 19:36:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757249AbcILTgx (ORCPT ); Mon, 12 Sep 2016 15:36:53 -0400 Received: from condef008-v.nifty.com ([210.131.4.245]:57060 "EHLO condef008-v.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757213AbcILTgu (ORCPT ); Mon, 12 Sep 2016 15:36:50 -0400 X-Greylist: delayed 345 seconds by postgrey-1.27 at vger.kernel.org; Mon, 12 Sep 2016 15:36:50 EDT Received: from conuserg-11.nifty.com ([10.26.8.74])by condef008-v.nifty.com with ESMTP id u8CJT8gE031308 for ; Tue, 13 Sep 2016 04:29:13 +0900 Received: from grover.sesame (FL1-111-169-71-157.osk.mesh.ad.jp [111.169.71.157]) (authenticated) by conuserg-11.nifty.com with ESMTP id u8CJRu39018376; Tue, 13 Sep 2016 04:28:06 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-11.nifty.com u8CJRu39018376 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1473708486; bh=m+Ibfa0o2+rNkadk+mHVFSVGtzXJcrcToMIwPliWXUQ=; h=From:To:Cc:Subject:Date:From; b=wrujLILInL5hDVpC+3d/xI8FjG7KgzoTU4hykgdrA3So59JPeX6uInC4T+LEuWlDM EkH+tK/Z+SKd4bRCHLoX5ow6xksRzqOiYJSCX4tHbEbCpS980p2ubVgFec9XivM0Bo wsWmERqRw04/xrpAhXvR01wg3Kykb7VWVbA1uzqt4d+Rf4jdJYxHosGX7FX3mVK22w 1XwIRrbdPgG13OaPlhlPMQQpBhhxoW+nzP47d5/4X2B7iQavtsls3l7lKryW+xDZUK LKP2RmOEmSHbCpIdNfJaTZciYcRVjw0orxa39BrXzY3Dg4M+2NqMEludeHCDKq14XA YexFDaDT7OGww== X-Nifty-SrcIP: [111.169.71.157] From: Masahiro Yamada To: linux-crypto@vger.kernel.org Cc: Masahiro Yamada , Herbert Xu , linux-kernel@vger.kernel.org, "David S. Miller" Subject: [PATCH] crypto: squash lines for simple wrapper functions Date: Tue, 13 Sep 2016 04:27:54 +0900 Message-Id: <1473708474-32359-1-git-send-email-yamada.masahiro@socionext.com> X-Mailer: git-send-email 1.9.1 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 Remove unneeded variables and assignments. Signed-off-by: Masahiro Yamada --- crypto/crct10dif_generic.c | 5 +---- crypto/mcryptd.c | 7 +------ drivers/crypto/hifn_795x.c | 12 ++---------- 3 files changed, 4 insertions(+), 20 deletions(-) diff --git a/crypto/crct10dif_generic.c b/crypto/crct10dif_generic.c index c1229614..8e94e29 100644 --- a/crypto/crct10dif_generic.c +++ b/crypto/crct10dif_generic.c @@ -107,10 +107,7 @@ static struct shash_alg alg = { static int __init crct10dif_mod_init(void) { - int ret; - - ret = crypto_register_shash(&alg); - return ret; + return crypto_register_shash(&alg); } static void __exit crct10dif_mod_fini(void) diff --git a/crypto/mcryptd.c b/crypto/mcryptd.c index 86fb59b..94ee44a 100644 --- a/crypto/mcryptd.c +++ b/crypto/mcryptd.c @@ -612,12 +612,7 @@ EXPORT_SYMBOL_GPL(mcryptd_alloc_ahash); int ahash_mcryptd_digest(struct ahash_request *desc) { - int err; - - err = crypto_ahash_init(desc) ?: - ahash_mcryptd_finup(desc); - - return err; + return crypto_ahash_init(desc) ?: ahash_mcryptd_finup(desc); } int ahash_mcryptd_update(struct ahash_request *desc) diff --git a/drivers/crypto/hifn_795x.c b/drivers/crypto/hifn_795x.c index eee2c7e..e09d405 100644 --- a/drivers/crypto/hifn_795x.c +++ b/drivers/crypto/hifn_795x.c @@ -636,20 +636,12 @@ struct hifn_request_context { static inline u32 hifn_read_0(struct hifn_device *dev, u32 reg) { - u32 ret; - - ret = readl(dev->bar[0] + reg); - - return ret; + return readl(dev->bar[0] + reg); } static inline u32 hifn_read_1(struct hifn_device *dev, u32 reg) { - u32 ret; - - ret = readl(dev->bar[1] + reg); - - return ret; + return readl(dev->bar[1] + reg); } static inline void hifn_write_0(struct hifn_device *dev, u32 reg, u32 val)