Commit a0302ff5 authored by wengjianfeng's avatar wengjianfeng Committed by David S. Miller
Browse files

nfc: s3fwrn5: remove unnecessary label 



Simplify the code by removing unnecessary label and returning directly.

Signed-off-by: default avatarwengjianfeng <wengjianfeng@yulong.com>
Reviewed-by: default avatarKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8f49efc9

drivers/nfc/s3fwrn5/firmware.c

+5 −7
Original line number Diff line number Diff line
@@ -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;

}