MIRRORS/linux-imx
1
0
Fork 0
mirror of https://github.com/nxp-imx/linux-imx.git synced 2025-07-14 13:19:36 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bluetooth: Remove usage of the deprecated ida_simple_xx() API

Browse Source 
[ Upstream commit 9c16d0c8d9 ]

ida_alloc() and ida_free() should be preferred to the deprecated
ida_simple_get() and ida_simple_remove().

Note that the upper limit of ida_simple_get() is exclusive, but the one of
ida_alloc_max() is inclusive. So a -1 has been added when needed.

Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Stable-dep-of: 84a4bb6548 ("Bluetooth: HCI: Remove HCI_AMP support")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Christophe JAILLET 2024-01-15 21:12:19 +01:00 committed by Greg Kroah-Hartman
parent f03d3322a7
commit 0a8af30a86
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
net/bluetooth/hci_core.c
View File

@ -2609,10 +2609,11 @@ int hci_register_dev(struct hci_dev *hdev)
*/ */
switch (hdev->dev_type) { switch (hdev->dev_type) {
case HCI_PRIMARY: case HCI_PRIMARY:
id = ida_simple_get(&hci_index_ida, 0, HCI_MAX_ID, GFP_KERNEL); id = ida_alloc_max(&hci_index_ida, HCI_MAX_ID - 1, GFP_KERNEL);
break; break;
case HCI_AMP: case HCI_AMP:
id = ida_simple_get(&hci_index_ida, 1, HCI_MAX_ID, GFP_KERNEL); id = ida_alloc_range(&hci_index_ida, 1, HCI_MAX_ID - 1,
GFP_KERNEL);
break; break;
default: default:
return -EINVAL; return -EINVAL;
@ -2711,7 +2712,7 @@ err_wqueue:
destroy_workqueue(hdev->workqueue); destroy_workqueue(hdev->workqueue);
destroy_workqueue(hdev->req_workqueue); destroy_workqueue(hdev->req_workqueue);
err: err:
ida_simple_remove(&hci_index_ida, hdev->id); ida_free(&hci_index_ida, hdev->id);
return error; return error;
} }
@ -2793,7 +2794,7 @@ void hci_release_dev(struct hci_dev *hdev)
hci_dev_unlock(hdev); hci_dev_unlock(hdev);
ida_destroy(&hdev->unset_handle_ida); ida_destroy(&hdev->unset_handle_ida);
ida_simple_remove(&hci_index_ida, hdev->id); ida_free(&hci_index_ida, hdev->id);
kfree_skb(hdev->sent_cmd); kfree_skb(hdev->sent_cmd);
kfree_skb(hdev->req_skb); kfree_skb(hdev->req_skb);
kfree_skb(hdev->recv_event); kfree_skb(hdev->recv_event);

4
net/bluetooth/hci_sock.c
View File

@ -101,7 +101,7 @@ static bool hci_sock_gen_cookie(struct sock *sk)
int id = hci_pi(sk)->cookie; int id = hci_pi(sk)->cookie;
if (!id) { if (!id) {
id = ida_simple_get(&sock_cookie_ida, 1, 0, GFP_KERNEL); id = ida_alloc_min(&sock_cookie_ida, 1, GFP_KERNEL);
if (id < 0) if (id < 0)
id = 0xffffffff; id = 0xffffffff;
@ -119,7 +119,7 @@ static void hci_sock_free_cookie(struct sock *sk)
if (id) { if (id) {
hci_pi(sk)->cookie = 0xffffffff; hci_pi(sk)->cookie = 0xffffffff;
ida_simple_remove(&sock_cookie_ida, id); ida_free(&sock_cookie_ida, id);
} }
} }