crypto: img-hash - remove need for error return variable ret

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 <colin.king@canonical.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/img-hash.c b/drivers/crypto/img-hash.c
index aa4c7b2af3e2e758acfe7f8b6c09c26ec8388038..d8e82d69745d8c95af1101c652a524e173edf540 100644 (file)
--- 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)