nfc: s3fwrn5: remove unnecessary label

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>

diff --git a/drivers/nfc/s3fwrn5/firmware.c b/drivers/nfc/s3fwrn5/firmware.c
index eb5d7a5beac7cee10518e15f6dfd489c2f48c43e..1421ffd46d9a4234c15d730f1f6c877c73984641 100644 (file)
--- 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;
 }