leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nfc: s3fwrn5: remove unnecessary label

Browse Source 
Simplify the code by removing unnecessary label and returning directly.

Signed-off-by: wengjianfeng <wengjianfeng@yulong.com>
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
wengjianfeng 2021-07-26 11:29:17 +08:00 committed by David S. Miller
parent 8f49efc9a0
commit a0302ff590
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/nfc/s3fwrn5/firmware.c
View File

@ -421,10 +421,9 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info)
tfm = crypto_alloc_shash("sha1", 0, 0); tfm = crypto_alloc_shash("sha1", 0, 0);
if (IS_ERR(tfm)) { if (IS_ERR(tfm)) {
ret = PTR_ERR(tfm);
dev_err(&fw_info->ndev->nfc_dev->dev, dev_err(&fw_info->ndev->nfc_dev->dev,
"Cannot allocate shash (code=%d)\n", ret); "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); 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) { if (ret) {
dev_err(&fw_info->ndev->nfc_dev->dev, dev_err(&fw_info->ndev->nfc_dev->dev,
"Cannot compute hash (code=%d)\n", ret); "Cannot compute hash (code=%d)\n", ret);
goto out; return ret;
} }
/* Firmware update process */ /* Firmware update process */
@ -446,7 +445,7 @@ int s3fwrn5_fw_download(struct s3fwrn5_fw_info *fw_info)
if (ret < 0) { if (ret < 0) {
dev_err(&fw_info->ndev->nfc_dev->dev, dev_err(&fw_info->ndev->nfc_dev->dev,
"Unable to enter update mode\n"); "Unable to enter update mode\n");
goto out; return ret;
} }
for (off = 0; off < image_size; off += fw_info->sector_size) { 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) { if (ret < 0) {
dev_err(&fw_info->ndev->nfc_dev->dev, dev_err(&fw_info->ndev->nfc_dev->dev,
"Firmware update error (code=%d)\n", ret); "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) { if (ret < 0) {
dev_err(&fw_info->ndev->nfc_dev->dev, dev_err(&fw_info->ndev->nfc_dev->dev,
"Unable to complete update mode\n"); "Unable to complete update mode\n");
goto out; return ret;
} }
dev_info(&fw_info->ndev->nfc_dev->dev, dev_info(&fw_info->ndev->nfc_dev->dev,
"Firmware update: success\n"); "Firmware update: success\n");
out:
return ret; return ret;
} }