* [PATCH] Bluetooth: ISO: Clean up returns values in iso_connect_ind()
@ 2024-03-02 8:30 Dan Carpenter
2024-03-04 16:30 ` patchwork-bot+bluetooth
0 siblings, 1 reply; 2+ messages in thread
From: Dan Carpenter @ 2024-03-02 8:30 UTC (permalink / raw)
To: Luiz Augusto von Dentz
Cc: Marcel Holtmann, Johan Hedberg, linux-bluetooth, linux-kernel,
kernel-janitors
This function either returns 0 or HCI_LM_ACCEPT. Make it clearer which
returns are which and delete the "lm" variable because it is no longer
required.
Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
---
net/bluetooth/iso.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/net/bluetooth/iso.c b/net/bluetooth/iso.c
index 30c777c469f9..8af75d37b14c 100644
--- a/net/bluetooth/iso.c
+++ b/net/bluetooth/iso.c
@@ -1910,7 +1910,6 @@ int iso_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 *flags)
struct hci_evt_le_big_info_adv_report *ev2;
struct hci_ev_le_per_adv_report *ev3;
struct sock *sk;
- int lm = 0;
bt_dev_dbg(hdev, "bdaddr %pMR", bdaddr);
@@ -1954,7 +1953,7 @@ int iso_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 *flags)
if (sk && test_bit(BT_SK_PA_SYNC_TERM,
&iso_pi(sk)->flags))
- return lm;
+ return 0;
}
if (sk) {
@@ -2041,16 +2040,14 @@ int iso_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr, __u8 *flags)
done:
if (!sk)
- return lm;
-
- lm |= HCI_LM_ACCEPT;
+ return 0;
if (test_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags))
*flags |= HCI_PROTO_DEFER;
sock_put(sk);
- return lm;
+ return HCI_LM_ACCEPT;
}
static void iso_connect_cfm(struct hci_conn *hcon, __u8 status)
--
2.43.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH] Bluetooth: ISO: Clean up returns values in iso_connect_ind()
2024-03-02 8:30 [PATCH] Bluetooth: ISO: Clean up returns values in iso_connect_ind() Dan Carpenter
@ 2024-03-04 16:30 ` patchwork-bot+bluetooth
0 siblings, 0 replies; 2+ messages in thread
From: patchwork-bot+bluetooth @ 2024-03-04 16:30 UTC (permalink / raw)
To: Dan Carpenter
Cc: luiz.dentz, marcel, johan.hedberg, linux-bluetooth, linux-kernel,
kernel-janitors
Hello:
This patch was applied to bluetooth/bluetooth-next.git (master)
by Luiz Augusto von Dentz <luiz.von.dentz@intel.com>:
On Sat, 2 Mar 2024 11:30:43 +0300 you wrote:
> This function either returns 0 or HCI_LM_ACCEPT. Make it clearer which
> returns are which and delete the "lm" variable because it is no longer
> required.
>
> Signed-off-by: Dan Carpenter <dan.carpenter@linaro.org>
> ---
> net/bluetooth/iso.c | 9 +++------
> 1 file changed, 3 insertions(+), 6 deletions(-)
Here is the summary with links:
- Bluetooth: ISO: Clean up returns values in iso_connect_ind()
https://git.kernel.org/bluetooth/bluetooth-next/c/d64e5af89e6c
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2024-03-04 16:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-02 8:30 [PATCH] Bluetooth: ISO: Clean up returns values in iso_connect_ind() Dan Carpenter
2024-03-04 16:30 ` patchwork-bot+bluetooth
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox