Skip to content

Commit 43fa32d

Browse files
wengjianfengdavem330
authored andcommitted
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: wengjianfeng <[email protected]> Reviewed-by: Krzysztof Kozlowski <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 62d3f4a commit 43fa32d

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

drivers/nfc/fdp/fdp.c

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ static int fdp_nci_request_firmware(struct nci_dev *ndev)
266266
r = request_firmware(&info->ram_patch, FDP_RAM_PATCH_NAME, dev);
267267
if (r < 0) {
268268
nfc_err(dev, "RAM patch request error\n");
269-
goto error;
269+
return r;
270270
}
271271

272272
data = (u8 *) info->ram_patch->data;
@@ -283,7 +283,7 @@ static int fdp_nci_request_firmware(struct nci_dev *ndev)
283283
r = request_firmware(&info->otp_patch, FDP_OTP_PATCH_NAME, dev);
284284
if (r < 0) {
285285
nfc_err(dev, "OTP patch request error\n");
286-
goto out;
286+
return 0;
287287
}
288288

289289
data = (u8 *) info->otp_patch->data;
@@ -295,10 +295,7 @@ static int fdp_nci_request_firmware(struct nci_dev *ndev)
295295

296296
dev_dbg(dev, "OTP patch version: %d, size: %d\n",
297297
info->otp_patch_version, (int) info->otp_patch->size);
298-
out:
299298
return 0;
300-
error:
301-
return r;
302299
}
303300

304301
static void fdp_nci_release_firmware(struct nci_dev *ndev)

0 commit comments

Comments
 (0)