Message ID | 20210610024616.1804-1-samirweng1979@163.com |
---|---|
State | New |
Headers | show |
Series | nfc: fdp: remove unnecessary labels | expand |
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Thu, 10 Jun 2021 10:46:16 +0800 you wrote: > From: wengjianfeng <wengjianfeng@yulong.com> > > Some labels are meaningless, so we delete them and use the > return statement instead of the goto statement. > > Signed-off-by: wengjianfeng <wengjianfeng@yulong.com> > > [...] Here is the summary with links: - nfc: fdp: remove unnecessary labels https://git.kernel.org/netdev/net-next/c/43fa32d1cc1b You are awesome, thank you! -- Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html
diff --git a/drivers/nfc/fdp/fdp.c b/drivers/nfc/fdp/fdp.c index 7863b25..5287458 100644 --- a/drivers/nfc/fdp/fdp.c +++ b/drivers/nfc/fdp/fdp.c @@ -266,7 +266,7 @@ static int fdp_nci_request_firmware(struct nci_dev *ndev) r = request_firmware(&info->ram_patch, FDP_RAM_PATCH_NAME, dev); if (r < 0) { nfc_err(dev, "RAM patch request error\n"); - goto error; + return r; } data = (u8 *) info->ram_patch->data; @@ -283,7 +283,7 @@ static int fdp_nci_request_firmware(struct nci_dev *ndev) r = request_firmware(&info->otp_patch, FDP_OTP_PATCH_NAME, dev); if (r < 0) { nfc_err(dev, "OTP patch request error\n"); - goto out; + return 0; } data = (u8 *) info->otp_patch->data; @@ -295,10 +295,7 @@ static int fdp_nci_request_firmware(struct nci_dev *ndev) dev_dbg(dev, "OTP patch version: %d, size: %d\n", info->otp_patch_version, (int) info->otp_patch->size); -out: return 0; -error: - return r; } static void fdp_nci_release_firmware(struct nci_dev *ndev)