Received: by 2002:a05:6a10:eb17:0:0:0:0 with SMTP id hx23csp1402727pxb; Fri, 10 Sep 2021 05:16:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwyMjvqZTu8pJrbZ8or0pVtvp4ruNE4jPcYvf5S9f/gx0ZUC09WZGYSWjXeM2MvbJ1yT1dM X-Received: by 2002:a05:6402:1907:: with SMTP id e7mr8505280edz.201.1631276174086; Fri, 10 Sep 2021 05:16:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631276174; cv=none; d=google.com; s=arc-20160816; b=MBARkfhY3iGV4Ys5pZDO/6dRYi43/VYsjWj0q+BnF/tWQaVUCXdz5Ph4n/ghgJ7bSC Vbxi32Xqu1eBHNjTIi/VeS5pPRimf+Fys1hO9p0PG+uoNTXN/tmn1+TZPNNMLPtDhsNn KnYVsbq19MqifZUdBjor9NjudRU7TzV9HaZ3Y1ijuyVgFNYYeUASpcO+bDJ93oe7tUND abvhof+BZNxjzQ8V+v30nssN69FVPZpyCvM9cadXb/7GwMA0LxGgdj5xRDgi3ukyUogp 8c+a26xy1XHQnUboruSeFpyuG47q2l2n6RFTfMCyzbilTGt90r5GBKI7CcmLmuHDlq84 mMfw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=WH5acUJXrOaRqz+J2404Ycvly8mHVPMOcA9T/AX5FBw=; b=Y/XakpQj/ehzyeRP25hiCnxxbLYWbdEPChl82OraLirS4JCZsv193j5KbBpyLoEfyN YijhKsBu09UffCmoPaxwCcoBVTgkQBq80A9nTOPro0jUQ8oy4jZvkyJN8ZYxqG8XRQx0 1ISXj81ocfRxo49bKFeoBFPE3CJZ297UEqFZ3+C43+hP7GF9NtrsVFpfK0QP8w4/5nKD K6RuvD9l7MnUrGPZtorMnS0mePSDjUX2pSbHxVHm0r3zbKlyqGADiEUKg8D0AIyaJblN GJHQjuZLgSkh+J7lnZMWLQU2H6ywZ+Fc0VUqAgRjzrGmjfRB2bx7EFXYvyLY6Y7gENDG N0wA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=b0PPT3Ta; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id k7si5023164ejo.10.2021.09.10.05.15.39; Fri, 10 Sep 2021 05:16:14 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@canonical.com header.s=20210705 header.b=b0PPT3Ta; spf=pass (google.com: domain of linux-crypto-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-crypto-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=canonical.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232952AbhIJMQq (ORCPT + 99 others); Fri, 10 Sep 2021 08:16:46 -0400 Received: from smtp-relay-canonical-1.canonical.com ([185.125.188.121]:37878 "EHLO smtp-relay-canonical-1.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232941AbhIJMQp (ORCPT ); Fri, 10 Sep 2021 08:16:45 -0400 Received: from localhost (1.general.cking.uk.vpn [10.172.193.212]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-canonical-1.canonical.com (Postfix) with ESMTPSA id AF3223F328; Fri, 10 Sep 2021 12:15:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1631276132; bh=WH5acUJXrOaRqz+J2404Ycvly8mHVPMOcA9T/AX5FBw=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version:Content-Type; b=b0PPT3Tadgfgm16gBw637065w4w47RlmElz/m56mi5dfOfRt8xW8x5u7Uxzzzg6aS 0qRdyU2IWl2rVPnw1aoqI3eJfEU8Ecgsa2EVZC18VWDS71FJbiY8UvCWSdT/4T6yx7 SyVjA/lwqnpfjTNH8pTdsAUPcosdbBRQVJNtm0pZTCuQ4TNz2ekL2lj6JT7Iy128g1 l2jtkPXn2npVaNbKyx9zfxDYHDQPs5HUJwWe832vmcFO2gXXN1VxBlfr67jG9amtCm p4Vjlt8jg8B9BSaXdGOaFHWd2SKSFKN/vy4t99XyVNOBrlhKtKFWqrlqF8hJTSEnZL RZjPidX5CVeHg== From: Colin King To: Herbert Xu , "David S . Miller" , linux-crypto@vger.kernel.org Cc: kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] crypto: img-hash: remove need for error return variable ret Date: Fri, 10 Sep 2021 13:15:32 +0100 Message-Id: <20210910121532.50366-1-colin.king@canonical.com> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-crypto@vger.kernel.org From: Colin Ian King The assignment to error return variable ret and then the jump to an error exit path can be simplified by just returning the error return at the failure point. This allows variable ret and the error return path to be removed. This cleans up a static analysis warninng that variable ret is being assigned (value never being used) and being re-assigned later. Addresses-Coverity: ("Unused value") Signed-off-by: Colin Ian King --- drivers/crypto/img-hash.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/crypto/img-hash.c b/drivers/crypto/img-hash.c index aa4c7b2af3e2..d8e82d69745d 100644 --- a/drivers/crypto/img-hash.c +++ b/drivers/crypto/img-hash.c @@ -674,14 +674,12 @@ static int img_hash_digest(struct ahash_request *req) static int img_hash_cra_init(struct crypto_tfm *tfm, const char *alg_name) { struct img_hash_ctx *ctx = crypto_tfm_ctx(tfm); - int err = -ENOMEM; ctx->fallback = crypto_alloc_ahash(alg_name, 0, CRYPTO_ALG_NEED_FALLBACK); if (IS_ERR(ctx->fallback)) { pr_err("img_hash: Could not load fallback driver.\n"); - err = PTR_ERR(ctx->fallback); - goto err; + return PTR_ERR(ctx->fallback); } crypto_ahash_set_reqsize(__crypto_ahash_cast(tfm), sizeof(struct img_hash_request_ctx) + @@ -689,9 +687,6 @@ static int img_hash_cra_init(struct crypto_tfm *tfm, const char *alg_name) IMG_HASH_DMA_THRESHOLD); return 0; - -err: - return err; } static int img_hash_cra_md5_init(struct crypto_tfm *tfm) -- 2.32.0