提交 43fa32d1 编写于 作者: W wengjianfeng 提交者: David S. Miller

nfc: fdp: remove unnecessary labels

Some labels are meaningless, so we delete them and use the
return statement instead of the goto statement.
Signed-off-by: Nwengjianfeng <wengjianfeng@yulong.com>
Reviewed-by: NKrzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
Signed-off-by: NDavid S. Miller <davem@davemloft.net>
上级 62d3f4af
...@@ -266,7 +266,7 @@ static int fdp_nci_request_firmware(struct nci_dev *ndev) ...@@ -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); r = request_firmware(&info->ram_patch, FDP_RAM_PATCH_NAME, dev);
if (r < 0) { if (r < 0) {
nfc_err(dev, "RAM patch request error\n"); nfc_err(dev, "RAM patch request error\n");
goto error; return r;
} }
data = (u8 *) info->ram_patch->data; data = (u8 *) info->ram_patch->data;
...@@ -283,7 +283,7 @@ static int fdp_nci_request_firmware(struct nci_dev *ndev) ...@@ -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); r = request_firmware(&info->otp_patch, FDP_OTP_PATCH_NAME, dev);
if (r < 0) { if (r < 0) {
nfc_err(dev, "OTP patch request error\n"); nfc_err(dev, "OTP patch request error\n");
goto out; return 0;
} }
data = (u8 *) info->otp_patch->data; data = (u8 *) info->otp_patch->data;
...@@ -295,10 +295,7 @@ static int fdp_nci_request_firmware(struct nci_dev *ndev) ...@@ -295,10 +295,7 @@ static int fdp_nci_request_firmware(struct nci_dev *ndev)
dev_dbg(dev, "OTP patch version: %d, size: %d\n", dev_dbg(dev, "OTP patch version: %d, size: %d\n",
info->otp_patch_version, (int) info->otp_patch->size); info->otp_patch_version, (int) info->otp_patch->size);
out:
return 0; return 0;
error:
return r;
} }
static void fdp_nci_release_firmware(struct nci_dev *ndev) static void fdp_nci_release_firmware(struct nci_dev *ndev)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册