From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752366AbcIOOnm (ORCPT ); Thu, 15 Sep 2016 10:43:42 -0400 Received: from mout.web.de ([217.72.192.78]:59999 "EHLO mout.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750974AbcIOOnd (ORCPT ); Thu, 15 Sep 2016 10:43:33 -0400 Subject: [PATCH 4/6] crypto-caamhash: Return a value directly in caam_hash_cra_init() To: linux-crypto@vger.kernel.org, "David S. Miller" , Herbert Xu , Labbe Corentin , Russell King References: <566ABCD9.1060404@users.sourceforge.net> <970e9e1b-c1dc-eb28-b380-92c15e9b1961@users.sourceforge.net> Cc: LKML , kernel-janitors@vger.kernel.org, Julia Lawall From: SF Markus Elfring Message-ID: <6f8877c6-873b-ee9d-596e-2567eed44962@users.sourceforge.net> Date: Thu, 15 Sep 2016 16:43:21 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 MIME-Version: 1.0 In-Reply-To: <970e9e1b-c1dc-eb28-b380-92c15e9b1961@users.sourceforge.net> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Provags-ID: V03:K0:Z4fuMnmYXpRFyhcg9tWqzpPnlJc5eHcJXUMOmeLgwgFWyGRSq8R P0L5U2JnVrdCUxL/GKm9ONVGN48DQr05LPfbjq/KnchnbtvdiZimQdrMUUejkbrCJgW461u Sqe+8k0CdE2H14D3+C5CdGyW3GrufIpZMC5jUFHfVDT7V8yovk9yFc019MNVVE8A+c79XBi cBeN+kJ/pnoheTXxCGQpw== X-UI-Out-Filterresults: notjunk:1;V01:K0:unRdVe6PpBk=:+AwZe0n+twyLVf4NHMi0Gx A/Fac/OLH0GZNENQ167l9T5/BEzmOcRV2vCMrxw+ZzXhTcD+TzMBN6jpxXoEFbCdQm47Va9/p LYOFUARzuj+k+Q8utOgzdLgDlSjVWeRmEXCiizfTOKA7Zir2KzWeD5WeG3rnm2NhrTWXReofT sFJ4wPfRf0x8QnlftCawYLGz3s0DXnR4jEbw6bAM36oSexgjuEctmMTcpHnlhBEsxNyG43X1O U/pQqGHcsi8QmCu0aLbFPiWjS01X3WEEghv8gYuRmb+I6VFZqoUfUElx4Tf0GgXDQoYEIG2ZF NYsC1CzlBUyFtUNfNNoVfgxiux4799B3SWFm3SpZxi7Wd2X4sysPwWkKreBjFwiwjJjAA8owN 0YOFiP7wQ/vj4wfFGvUrASQcRAh+QqDFXTN0z6qgVrFwIPnlstnwraj8Wd3NpLysHcZAB4MdK 794kSVxyFtnZF2kC3TIJTJqi14HjIDfkOlHus2F1U6agcEs54vxlV5ETafSvzqPyg5u3hP11M hAqXAW8LR0bkdO3WtHRkW5DmqNjKiB09M7cjsxrICZ5p+Thancpk76XWJ6seW0vrL9mhg50yO eagXOj4CteemRrIxOulT5KBS7rSSp10dQuvFxwtx0qZdHsSrBZp1V05lmj48xFz+R15deXc6Z 2uWeWCdrrKS08Crb6RScrHOYkHU+L8Tke/0EiMjIqosWzbWEgLnP9KKCF0hEawuGG/XVALkCS 7eCHEqoASKI4PTQNAJMDbFaBt33ywoWbf9NHxZySL5DrjqptiAT7Q8jNhXV4TkTE0OQpYJQua 640Ws+V Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Markus Elfring Date: Thu, 15 Sep 2016 14:56:12 +0200 * Return a value at the end without storing it in an intermediate variable. * Delete the local variable "ret" which became unnecessary with this refactoring. Signed-off-by: Markus Elfring --- drivers/crypto/caam/caamhash.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/crypto/caam/caamhash.c b/drivers/crypto/caam/caamhash.c index 933252f..b1dbc53 100644 --- a/drivers/crypto/caam/caamhash.c +++ b/drivers/crypto/caam/caamhash.c @@ -1846,7 +1846,6 @@ static int caam_hash_cra_init(struct crypto_tfm *tfm) HASH_MSG_LEN + SHA256_DIGEST_SIZE, HASH_MSG_LEN + 64, HASH_MSG_LEN + SHA512_DIGEST_SIZE }; - int ret = 0; /* * Get a Job ring from Job Ring driver to ensure in-order @@ -1866,10 +1865,7 @@ static int caam_hash_cra_init(struct crypto_tfm *tfm) crypto_ahash_set_reqsize(__crypto_ahash_cast(tfm), sizeof(struct caam_hash_state)); - - ret = ahash_set_sh_desc(ahash); - - return ret; + return ahash_set_sh_desc(ahash); } static void caam_hash_cra_exit(struct crypto_tfm *tfm) -- 2.10.0