Messages in this thread Patch in this message | | | From | samirweng1979 <> | Subject | [PATCH] nfc: s3fwrn5: remove unnecessary label | Date | Fri, 2 Apr 2021 20:15:48 +0800 |
| |
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
| |