[PATCH v2] NFC: nxp-nci: remove unnecessary label

Subsystems: nfc subsystem, the rest

STALE1879d

3 messages, 3 authors, 2021-06-18 · open the first message on its own page

[PATCH v2] NFC: nxp-nci: remove unnecessary label

From: samirweng1979 <hidden>
Date: 2021-06-18 15:27:49

From: wengjianfeng <redacted>

Remove unnecessary label chunk_exit and return directly.

Signed-off-by: wengjianfeng <redacted>
---
 drivers/nfc/nxp-nci/firmware.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/nfc/nxp-nci/firmware.c b/drivers/nfc/nxp-nci/firmware.c
index dae0c80..119bf30 100644
--- a/drivers/nfc/nxp-nci/firmware.c
+++ b/drivers/nfc/nxp-nci/firmware.c
@@ -95,10 +95,8 @@ static int nxp_nci_fw_send_chunk(struct nxp_nci_info *info)
 	int r;
 
 	skb = nci_skb_alloc(info->ndev, info->max_payload, GFP_KERNEL);
-	if (!skb) {
-		r = -ENOMEM;
-		goto chunk_exit;
-	}
+	if (!skb)
+		return -ENOMEM;
 
 	chunk_len = info->max_payload - NXP_NCI_FW_HDR_LEN - NXP_NCI_FW_CRC_LEN;
 	remaining_len = fw_info->frame_size - fw_info->written;
@@ -124,7 +122,6 @@ static int nxp_nci_fw_send_chunk(struct nxp_nci_info *info)
 
 	kfree_skb(skb);
 
-chunk_exit:
 	return r;
 }
 
-- 
1.9.1

Re: [PATCH v2] NFC: nxp-nci: remove unnecessary label

From: Krzysztof Kozlowski <hidden>
Date: 2021-06-18 09:01:21

On 18/06/2021 10:52, samirweng1979 wrote:
From: wengjianfeng <redacted>

Remove unnecessary label chunk_exit and return directly.

Signed-off-by: wengjianfeng <redacted>
---
 drivers/nfc/nxp-nci/firmware.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

Reviewed-by: Krzysztof Kozlowski <redacted>

Best regards,
Krzysztof
quoted hunk
diff --git a/drivers/nfc/nxp-nci/firmware.c b/drivers/nfc/nxp-nci/firmware.c
index dae0c80..119bf30 100644
--- a/drivers/nfc/nxp-nci/firmware.c
+++ b/drivers/nfc/nxp-nci/firmware.c
@@ -95,10 +95,8 @@ static int nxp_nci_fw_send_chunk(struct nxp_nci_info *info)
 	int r;
 
 	skb = nci_skb_alloc(info->ndev, info->max_payload, GFP_KERNEL);
-	if (!skb) {
-		r = -ENOMEM;
-		goto chunk_exit;
-	}
+	if (!skb)
+		return -ENOMEM;
 
 	chunk_len = info->max_payload - NXP_NCI_FW_HDR_LEN - NXP_NCI_FW_CRC_LEN;
 	remaining_len = fw_info->frame_size - fw_info->written;
@@ -124,7 +122,6 @@ static int nxp_nci_fw_send_chunk(struct nxp_nci_info *info)
 
 	kfree_skb(skb);
 
-chunk_exit:
 	return r;
 }
 

Re: [PATCH v2] NFC: nxp-nci: remove unnecessary label

From: patchwork-bot+netdevbpf@kernel.org
Date: 2021-06-18 20:00:08

Hello:

This patch was applied to netdev/net-next.git (refs/heads/master):

On Fri, 18 Jun 2021 16:52:26 +0800 you wrote:
From: wengjianfeng <redacted>

Remove unnecessary label chunk_exit and return directly.

Signed-off-by: wengjianfeng <redacted>
---
 drivers/nfc/nxp-nci/firmware.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
Here is the summary with links:
  - [v2] NFC: nxp-nci: remove unnecessary label
    https://git.kernel.org/netdev/net-next/c/7437a2230e39

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help