leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nfc/fdp: remove unnecessary assignment and label

Browse Source 
In function fdp_nci_patch_otp and fdp_nci_patch_ram，many goto
out statements are used, and out label just return variable r.
in some places,just jump to the out label, and in other places,
assign a value to the variable r,then jump to the out label.
It is unnecessary, we just use return sentences to replace goto
sentences and delete out label.

Signed-off-by: wengjianfeng <wengjianfeng@yulong.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
wengjianfeng 2021-04-07 11:16:38 +08:00 committed by David S. Miller
parent d567fd6e82
commit 872fff333f
1 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/nfc/fdp/fdp.c
View File

@ -344,7 +344,7 @@ static int fdp_nci_patch_otp(struct nci_dev *ndev)
int r = 0;
if (info->otp_version >= info->otp_patch_version)
goto out;
return r;
info->setup_patch_sent = 0;
info->setup_reset_ntf = 0;
@ -353,19 +353,17 @@ static int fdp_nci_patch_otp(struct nci_dev *ndev)
/* Patch init request */
r = fdp_nci_patch_cmd(ndev, NCI_PATCH_TYPE_OTP);
if (r)
goto out;
return r;
/* Patch data connection creation */
conn_id = fdp_nci_create_conn(ndev);
if (conn_id < 0) {
r = conn_id;
goto out;
}
if (conn_id < 0)
return conn_id;
/* Send the patch over the data connection */
r = fdp_nci_send_patch(ndev, conn_id, NCI_PATCH_TYPE_OTP);
if (r)
goto out;
return r;
/* Wait for all the packets to be send over i2c */
wait_event_interruptible(info->setup_wq,
@ -377,13 +375,12 @@ static int fdp_nci_patch_otp(struct nci_dev *ndev)
/* Close the data connection */
r = nci_core_conn_close(info->ndev, conn_id);
if (r)
goto out;
return r;
/* Patch finish message */
if (fdp_nci_patch_cmd(ndev, NCI_PATCH_TYPE_EOT)) {
nfc_err(dev, "OTP patch error 0x%x\n", r);
r = -EINVAL;
goto out;
return -EINVAL;
}
/* If the patch notification didn't arrive yet, wait for it */
@ -393,8 +390,7 @@ static int fdp_nci_patch_otp(struct nci_dev *ndev)
r = info->setup_patch_status;
if (r) {
nfc_err(dev, "OTP patch error 0x%x\n", r);
r = -EINVAL;
goto out;
return -EINVAL;
}
/*
@ -403,7 +399,6 @@ static int fdp_nci_patch_otp(struct nci_dev *ndev)
*/
wait_event_interruptible(info->setup_wq, info->setup_reset_ntf);
out:
return r;
}
@ -415,7 +410,7 @@ static int fdp_nci_patch_ram(struct nci_dev *ndev)
int r = 0;
if (info->ram_version >= info->ram_patch_version)
goto out;
return r;
info->setup_patch_sent = 0;
info->setup_reset_ntf = 0;
@ -424,19 +419,17 @@ static int fdp_nci_patch_ram(struct nci_dev *ndev)
/* Patch init request */
r = fdp_nci_patch_cmd(ndev, NCI_PATCH_TYPE_RAM);
if (r)
goto out;
return r;
/* Patch data connection creation */
conn_id = fdp_nci_create_conn(ndev);
if (conn_id < 0) {
r = conn_id;
goto out;
}
if (conn_id < 0)
return conn_id;
/* Send the patch over the data connection */
r = fdp_nci_send_patch(ndev, conn_id, NCI_PATCH_TYPE_RAM);
if (r)
goto out;
return r;
/* Wait for all the packets to be send over i2c */
wait_event_interruptible(info->setup_wq,
@ -448,13 +441,12 @@ static int fdp_nci_patch_ram(struct nci_dev *ndev)
/* Close the data connection */
r = nci_core_conn_close(info->ndev, conn_id);
if (r)
goto out;
return r;
/* Patch finish message */
if (fdp_nci_patch_cmd(ndev, NCI_PATCH_TYPE_EOT)) {
nfc_err(dev, "RAM patch error 0x%x\n", r);
r = -EINVAL;
goto out;
return -EINVAL;
}
/* If the patch notification didn't arrive yet, wait for it */
@ -464,8 +456,7 @@ static int fdp_nci_patch_ram(struct nci_dev *ndev)
r = info->setup_patch_status;
if (r) {
nfc_err(dev, "RAM patch error 0x%x\n", r);
r = -EINVAL;
goto out;
return -EINVAL;
}
/*
@ -474,7 +465,6 @@ static int fdp_nci_patch_ram(struct nci_dev *ndev)
*/
wait_event_interruptible(info->setup_wq, info->setup_reset_ntf);
out:
return r;
}