| Message ID | 20210526005651.12652-1-samirweng1979@163.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] nfc: st95hf: remove unnecessary assignment and label | expand |
On 25/05/2021 20:56, samirweng1979 wrote: > From: wengjianfeng <wengjianfeng@yulong.com> > > In function st95hf_in_send_cmd, the variable rc is assigned then goto > error label, which just returns rc, so we use return to replace it. > Since error label only used once in the function, so we remove error label. > > Signed-off-by: wengjianfeng <wengjianfeng@yulong.com> > --- > drivers/nfc/st95hf/core.c | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Best regards, Krzysztof
Hello: This patch was applied to netdev/net-next.git (refs/heads/master): On Wed, 26 May 2021 08:56:51 +0800 you wrote: > From: wengjianfeng <wengjianfeng@yulong.com> > > In function st95hf_in_send_cmd, the variable rc is assigned then goto > error label, which just returns rc, so we use return to replace it. > Since error label only used once in the function, so we remove error label. > > Signed-off-by: wengjianfeng <wengjianfeng@yulong.com> > > [...] Here is the summary with links: - [v2] nfc: st95hf: remove unnecessary assignment and label https://git.kernel.org/netdev/net-next/c/568e7142a15f 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/st95hf/core.c b/drivers/nfc/st95hf/core.c index 4578547..88924be 100644 --- a/drivers/nfc/st95hf/core.c +++ b/drivers/nfc/st95hf/core.c @@ -926,10 +926,8 @@ static int st95hf_in_send_cmd(struct nfc_digital_dev *ddev, int len_data_to_tag = 0; skb_resp = nfc_alloc_recv_skb(MAX_RESPONSE_BUFFER_SIZE, GFP_KERNEL); - if (!skb_resp) { - rc = -ENOMEM; - goto error; - } + if (!skb_resp) + return -ENOMEM; switch (stcontext->current_rf_tech) { case NFC_DIGITAL_RF_TECH_106A: @@ -986,7 +984,6 @@ static int st95hf_in_send_cmd(struct nfc_digital_dev *ddev, free_skb_resp: kfree_skb(skb_resp); -error: return rc; }