[PATCH] nfc: s3fwrn5: remove unnecessary label

[PATCH] nfc: s3fwrn5: remove unnecessary label

[samirweng1979]

From: wengjianfeng <wengjianfeng@yulong.com>

Simplify the code by removing unnecessary label and returning directly.

Signed-off-by: wengjianfeng <wengjianfeng@yulong.com>
---
 drivers/nfc/s3fwrn5/firmware.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/drivers/nfc/s3fwrn5/firmware.c b/drivers/nfc/s3fwrn5/firmware.c
index eb5d7a5b..1421ffd 100644
--- a/drivers/nfc/s3fwrn5/firmware.c
+++ b/drivers/nfc/s3fwrn5/firmware.c
@@ -421,10 +421,9 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info)
 
 	tfm = crypto_alloc_shash("sha1", 0, 0);
 	if (IS_ERR(tfm)) {
-		ret = PTR_ERR(tfm);
 		dev_err(&fw_info->ndev->nfc_dev->dev,
 			"Cannot allocate shash (code=%d)\n", ret);
-		goto out;
+		return PTR_ERR(tfm);
 	}
 
 	ret = crypto_shash_tfm_digest(tfm, fw->image, image_size, hash_data);
@@ -433,7 +432,7 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info)
 	if (ret) {
 		dev_err(&fw_info->ndev->nfc_dev->dev,
 			"Cannot compute hash (code=%d)\n", ret);
-		goto out;
+		return ret;
 	}
 
 	/* Firmware update process */
@@ -446,7 +445,7 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info)
 	if (ret < 0) {
 		dev_err(&fw_info->ndev->nfc_dev->dev,
 			"Unable to enter update mode\n");
-		goto out;
+		return ret;
 	}
 
 	for (off = 0; off < image_size; off += fw_info->sector_size) {
@@ -455,7 +454,7 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info)
 		if (ret < 0) {
 			dev_err(&fw_info->ndev->nfc_dev->dev,
 				"Firmware update error (code=%d)\n", ret);
-			goto out;
+			return ret;
 		}
 	}
 
@@ -463,13 +462,12 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info)
 	if (ret < 0) {
 		dev_err(&fw_info->ndev->nfc_dev->dev,
 			"Unable to complete update mode\n");
-		goto out;
+		return ret;
 	}
 
 	dev_info(&fw_info->ndev->nfc_dev->dev,
 		"Firmware update: success\n");
 
-out:
 	return ret;
 }
 
-- 
1.9.1

Re: [PATCH] nfc: s3fwrn5: remove unnecessary label

[kernel test robot]

[-- Attachment #1: Type: text/plain, Size: 7176 bytes --]

Hi samirweng1979,

Thank you for the patch! Perhaps something to improve:

[auto build test WARNING on linus/master]
[also build test WARNING on v5.14-rc3 next-20210723]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]

url:    https://github.com/0day-ci/linux/commits/samirweng1979/nfc-s3fwrn5-remove-unnecessary-label/20210726-113225
base:   https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git ff1176468d368232b684f75e82563369208bc371
config: x86_64-randconfig-a016-20210726 (attached as .config)
compiler: clang version 13.0.0 (https://github.com/llvm/llvm-project c63dbd850182797bc4b76124d08e1c320ab2365d)
reproduce (this is a W=1 build):
        wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # install x86_64 cross compiling tool for clang build
        # apt-get install binutils-x86-64-linux-gnu
        # https://github.com/0day-ci/linux/commit/8bfa32b5a53dadcaccabfcbafaf3811fdddeecc9
        git remote add linux-review https://github.com/0day-ci/linux
        git fetch --no-tags linux-review samirweng1979/nfc-s3fwrn5-remove-unnecessary-label/20210726-113225
        git checkout 8bfa32b5a53dadcaccabfcbafaf3811fdddeecc9
        # save the attached .config to linux build tree
        COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross ARCH=x86_64 

If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>

All warnings (new ones prefixed by >>):

>> drivers/nfc/s3fwrn5/firmware.c:425:41: warning: variable 'ret' is uninitialized when used here [-Wuninitialized]
                           "Cannot allocate shash (code=%d)\n", ret);
                                                                ^~~
   include/linux/dev_printk.h:112:32: note: expanded from macro 'dev_err'
           _dev_err(dev, dev_fmt(fmt), ##__VA_ARGS__)
                                         ^~~~~~~~~~~
   drivers/nfc/s3fwrn5/firmware.c:416:9: note: initialize the variable 'ret' to silence this warning
           int ret;
                  ^
                   = 0
   1 warning generated.


vim +/ret +425 drivers/nfc/s3fwrn5/firmware.c

c04c674fadeb4a Robert Baldyga 2015-08-20  409  
c04c674fadeb4a Robert Baldyga 2015-08-20  410  int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info)
c04c674fadeb4a Robert Baldyga 2015-08-20  411  {
c04c674fadeb4a Robert Baldyga 2015-08-20  412  	struct s3fwrn5_fw_image *fw = &fw_info->fw;
c04c674fadeb4a Robert Baldyga 2015-08-20  413  	u8 hash_data[SHA1_DIGEST_SIZE];
4a31340b36302d Herbert Xu     2016-01-24  414  	struct crypto_shash *tfm;
c04c674fadeb4a Robert Baldyga 2015-08-20  415  	u32 image_size, off;
c04c674fadeb4a Robert Baldyga 2015-08-20  416  	int ret;
c04c674fadeb4a Robert Baldyga 2015-08-20  417  
c04c674fadeb4a Robert Baldyga 2015-08-20  418  	image_size = fw_info->sector_size * fw->image_sectors;
c04c674fadeb4a Robert Baldyga 2015-08-20  419  
c04c674fadeb4a Robert Baldyga 2015-08-20  420  	/* Compute SHA of firmware data */
c04c674fadeb4a Robert Baldyga 2015-08-20  421  
4a31340b36302d Herbert Xu     2016-01-24  422  	tfm = crypto_alloc_shash("sha1", 0, 0);
4a31340b36302d Herbert Xu     2016-01-24  423  	if (IS_ERR(tfm)) {
4a31340b36302d Herbert Xu     2016-01-24  424  		dev_err(&fw_info->ndev->nfc_dev->dev,
4a31340b36302d Herbert Xu     2016-01-24 @425  			"Cannot allocate shash (code=%d)\n", ret);
8bfa32b5a53dad wengjianfeng   2021-07-26  426  		return PTR_ERR(tfm);
4a31340b36302d Herbert Xu     2016-01-24  427  	}
4a31340b36302d Herbert Xu     2016-01-24  428  
96a5aa721df8e7 Eric Biggers   2020-05-01  429  	ret = crypto_shash_tfm_digest(tfm, fw->image, image_size, hash_data);
4a31340b36302d Herbert Xu     2016-01-24  430  
4a31340b36302d Herbert Xu     2016-01-24  431  	crypto_free_shash(tfm);
4a31340b36302d Herbert Xu     2016-01-24  432  	if (ret) {
4a31340b36302d Herbert Xu     2016-01-24  433  		dev_err(&fw_info->ndev->nfc_dev->dev,
4a31340b36302d Herbert Xu     2016-01-24  434  			"Cannot compute hash (code=%d)\n", ret);
8bfa32b5a53dad wengjianfeng   2021-07-26  435  		return ret;
4a31340b36302d Herbert Xu     2016-01-24  436  	}
c04c674fadeb4a Robert Baldyga 2015-08-20  437  
c04c674fadeb4a Robert Baldyga 2015-08-20  438  	/* Firmware update process */
c04c674fadeb4a Robert Baldyga 2015-08-20  439  
c04c674fadeb4a Robert Baldyga 2015-08-20  440  	dev_info(&fw_info->ndev->nfc_dev->dev,
c04c674fadeb4a Robert Baldyga 2015-08-20  441  		"Firmware update: %s\n", fw_info->fw_name);
c04c674fadeb4a Robert Baldyga 2015-08-20  442  
c04c674fadeb4a Robert Baldyga 2015-08-20  443  	ret = s3fwrn5_fw_enter_update_mode(fw_info, hash_data,
c04c674fadeb4a Robert Baldyga 2015-08-20  444  		SHA1_DIGEST_SIZE, fw_info->sig, fw_info->sig_size);
c04c674fadeb4a Robert Baldyga 2015-08-20  445  	if (ret < 0) {
c04c674fadeb4a Robert Baldyga 2015-08-20  446  		dev_err(&fw_info->ndev->nfc_dev->dev,
c04c674fadeb4a Robert Baldyga 2015-08-20  447  			"Unable to enter update mode\n");
8bfa32b5a53dad wengjianfeng   2021-07-26  448  		return ret;
c04c674fadeb4a Robert Baldyga 2015-08-20  449  	}
c04c674fadeb4a Robert Baldyga 2015-08-20  450  
c04c674fadeb4a Robert Baldyga 2015-08-20  451  	for (off = 0; off < image_size; off += fw_info->sector_size) {
c04c674fadeb4a Robert Baldyga 2015-08-20  452  		ret = s3fwrn5_fw_update_sector(fw_info,
c04c674fadeb4a Robert Baldyga 2015-08-20  453  			fw_info->base_addr + off, fw->image + off);
c04c674fadeb4a Robert Baldyga 2015-08-20  454  		if (ret < 0) {
c04c674fadeb4a Robert Baldyga 2015-08-20  455  			dev_err(&fw_info->ndev->nfc_dev->dev,
c04c674fadeb4a Robert Baldyga 2015-08-20  456  				"Firmware update error (code=%d)\n", ret);
8bfa32b5a53dad wengjianfeng   2021-07-26  457  			return ret;
c04c674fadeb4a Robert Baldyga 2015-08-20  458  		}
c04c674fadeb4a Robert Baldyga 2015-08-20  459  	}
c04c674fadeb4a Robert Baldyga 2015-08-20  460  
c04c674fadeb4a Robert Baldyga 2015-08-20  461  	ret = s3fwrn5_fw_complete_update_mode(fw_info);
c04c674fadeb4a Robert Baldyga 2015-08-20  462  	if (ret < 0) {
c04c674fadeb4a Robert Baldyga 2015-08-20  463  		dev_err(&fw_info->ndev->nfc_dev->dev,
c04c674fadeb4a Robert Baldyga 2015-08-20  464  			"Unable to complete update mode\n");
8bfa32b5a53dad wengjianfeng   2021-07-26  465  		return ret;
c04c674fadeb4a Robert Baldyga 2015-08-20  466  	}
c04c674fadeb4a Robert Baldyga 2015-08-20  467  
c04c674fadeb4a Robert Baldyga 2015-08-20  468  	dev_info(&fw_info->ndev->nfc_dev->dev,
c04c674fadeb4a Robert Baldyga 2015-08-20  469  		"Firmware update: success\n");
c04c674fadeb4a Robert Baldyga 2015-08-20  470  
c04c674fadeb4a Robert Baldyga 2015-08-20  471  	return ret;
c04c674fadeb4a Robert Baldyga 2015-08-20  472  }
c04c674fadeb4a Robert Baldyga 2015-08-20  473  

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org

[-- Attachment #2: config.gz --]
[-- Type: application/gzip, Size: 40659 bytes --]

Re: [PATCH] nfc: s3fwrn5: remove unnecessary label

[Krzysztof Kozlowski]

On 26/07/2021 05:29, samirweng1979 wrote:
> From: wengjianfeng <wengjianfeng@yulong.com>
> 
> Simplify the code by removing unnecessary label and returning directly.
> 
> Signed-off-by: wengjianfeng <wengjianfeng@yulong.com>
> ---
>  drivers/nfc/s3fwrn5/firmware.c | 12 +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)


Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>

Best regards,
Krzysztof

> diff --git a/drivers/nfc/s3fwrn5/firmware.c b/drivers/nfc/s3fwrn5/firmware.c
> index eb5d7a5b..1421ffd 100644
> --- a/drivers/nfc/s3fwrn5/firmware.c
> +++ b/drivers/nfc/s3fwrn5/firmware.c
> @@ -421,10 +421,9 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info)
>  
>  	tfm = crypto_alloc_shash("sha1", 0, 0);
>  	if (IS_ERR(tfm)) {
> -		ret = PTR_ERR(tfm);
>  		dev_err(&fw_info->ndev->nfc_dev->dev,
>  			"Cannot allocate shash (code=%d)\n", ret);
> -		goto out;
> +		return PTR_ERR(tfm);
>  	}
>  
>  	ret = crypto_shash_tfm_digest(tfm, fw->image, image_size, hash_data);
> @@ -433,7 +432,7 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info)
>  	if (ret) {
>  		dev_err(&fw_info->ndev->nfc_dev->dev,
>  			"Cannot compute hash (code=%d)\n", ret);
> -		goto out;
> +		return ret;
>  	}
>  
>  	/* Firmware update process */
> @@ -446,7 +445,7 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info)
>  	if (ret < 0) {
>  		dev_err(&fw_info->ndev->nfc_dev->dev,
>  			"Unable to enter update mode\n");
> -		goto out;
> +		return ret;
>  	}
>  
>  	for (off = 0; off < image_size; off += fw_info->sector_size) {
> @@ -455,7 +454,7 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info)
>  		if (ret < 0) {
>  			dev_err(&fw_info->ndev->nfc_dev->dev,
>  				"Firmware update error (code=%d)\n", ret);
> -			goto out;
> +			return ret;
>  		}
>  	}
>  
> @@ -463,13 +462,12 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info)
>  	if (ret < 0) {
>  		dev_err(&fw_info->ndev->nfc_dev->dev,
>  			"Unable to complete update mode\n");
> -		goto out;
> +		return ret;
>  	}
>  
>  	dev_info(&fw_info->ndev->nfc_dev->dev,
>  		"Firmware update: success\n");
>  
> -out:
>  	return ret;
>  }
>  
> 

Re: [PATCH] nfc: s3fwrn5: remove unnecessary label

[patchwork-bot+netdevbpf]

Hello:

This patch was applied to netdev/net-next.git (refs/heads/master):

On Mon, 26 Jul 2021 11:29:17 +0800 you wrote:
> From: wengjianfeng <wengjianfeng@yulong.com>
> 
> Simplify the code by removing unnecessary label and returning directly.
> 
> Signed-off-by: wengjianfeng <wengjianfeng@yulong.com>
> ---
>  drivers/nfc/s3fwrn5/firmware.c | 12 +++++-------
>  1 file changed, 5 insertions(+), 7 deletions(-)

Here is the summary with links:
  - nfc: s3fwrn5: remove unnecessary label
    https://git.kernel.org/netdev/net-next/c/a0302ff5906a

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

Re: [PATCH] nfc: s3fwrn5: remove unnecessary label

[Krzysztof Kozlowski]

On 02/04/2021 14:15, samirweng1979 wrote:
> From: wengjianfeng <wengjianfeng@yulong.com>
> 
> In function s3fwrn5_nci_post_setup, The variable ret is assigned to 0,
> then goto out label, but just return ret in out label, so we use
> return 0 to replace it. and other goto sentences are similar, we use
> return sentences to replace it and delete out label.

The message is difficult to understand - you created one long sentence
with mixing tenses and subjects. "The" starts capital in the middle of
sentence but "and" starts after full stop.

Please rephrase it.

The code itself looks ok.

Best regards,
Krzysztof

[PATCH] nfc: s3fwrn5: remove unnecessary label

[samirweng1979]

From: wengjianfeng <wengjianfeng@yulong.com>

In function s3fwrn5_nci_post_setup, The variable ret is assigned to 0,
then goto out label, but just return ret in out label, so we use
return 0 to replace it. and other goto sentences are similar, we use
return sentences to replace it and delete out label.

Signed-off-by: wengjianfeng <wengjianfeng@yulong.com>
---
 drivers/nfc/s3fwrn5/core.c | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/drivers/nfc/s3fwrn5/core.c b/drivers/nfc/s3fwrn5/core.c
index c00b7a0..865d3e3 100644
--- a/drivers/nfc/s3fwrn5/core.c
+++ b/drivers/nfc/s3fwrn5/core.c
@@ -124,13 +124,12 @@ static int s3fwrn5_nci_post_setup(struct nci_dev *ndev)
 
 	if (s3fwrn5_firmware_init(info)) {
 		//skip bootloader mode
-		ret = 0;
-		goto out;
+		return 0;
 	}
 
 	ret = s3fwrn5_firmware_update(info);
 	if (ret < 0)
-		goto out;
+		return ret;
 
 	/* NCI core reset */
 
@@ -139,12 +138,9 @@ static int s3fwrn5_nci_post_setup(struct nci_dev *ndev)
 
 	ret = nci_core_reset(info->ndev);
 	if (ret < 0)
-		goto out;
-
-	ret = nci_core_init(info->ndev);
+		return ret;
 
-out:
-	return ret;
+	return nci_core_init(info->ndev);
 }
 
 static struct nci_ops s3fwrn5_nci_ops = {
-- 
1.9.1