[PATCH] Bluetooth: btmrvl: Slightly simplify btmrvl_process_event()

[PATCH] Bluetooth: btmrvl: Slightly simplify btmrvl_process_event()

[Christophe JAILLET]

In btmrvl_process_event(), all error handling paths except one do a direct
return. Update the only one that makes a goto to be consistent.

This does not change the behavior because ret is known to be != 0 when
'exit' is reached.

This simplifies the code, saves 2 LoC and pleases one of my coccinelle
script that tries to spot erroneously mixed goto and return statements.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
 drivers/bluetooth/btmrvl_main.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/drivers/bluetooth/btmrvl_main.c b/drivers/bluetooth/btmrvl_main.c
index e25930351f64..d449fbdde464 100644
--- a/drivers/bluetooth/btmrvl_main.c
+++ b/drivers/bluetooth/btmrvl_main.c
@@ -87,8 +87,7 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb)
 	event = (struct btmrvl_event *) skb->data;
 	if (event->ec != 0xff) {
 		BT_DBG("Not Marvell Event=%x", event->ec);
-		ret = -EINVAL;
-		goto exit;
+		return -EINVAL;
 	}
 
 	switch (event->data[0]) {
@@ -165,7 +164,6 @@ int btmrvl_process_event(struct btmrvl_private *priv, struct sk_buff *skb)
 		break;
 	}
 
-exit:
 	if (!ret)
 		kfree_skb(skb);
 
-- 
2.55.0

Re: [PATCH] Bluetooth: btmrvl: Slightly simplify btmrvl_process_event()

[patchwork-bot+bluetooth]

Hello:

This patch was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>:

On Sun,  9 Aug 2026 14:59:59 +0200 you wrote:
> In btmrvl_process_event(), all error handling paths except one do a direct
> return. Update the only one that makes a goto to be consistent.
> 
> This does not change the behavior because ret is known to be != 0 when
> 'exit' is reached.
> 
> This simplifies the code, saves 2 LoC and pleases one of my coccinelle
> script that tries to spot erroneously mixed goto and return statements.
> 
> [...]

Here is the summary with links:
  - Bluetooth: btmrvl: Slightly simplify btmrvl_process_event()
    https://git.kernel.org/bluetooth/bluetooth-next/c/b2d457736260

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