Commit 9c16d0c8 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Luiz Augusto von Dentz

Bluetooth: Remove usage of the deprecated ida_simple_xx() API

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: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent 560ff4bc
...@@ -2640,10 +2640,11 @@ int hci_register_dev(struct hci_dev *hdev) ...@@ -2640,10 +2640,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;
...@@ -2742,7 +2743,7 @@ int hci_register_dev(struct hci_dev *hdev) ...@@ -2742,7 +2743,7 @@ int hci_register_dev(struct hci_dev *hdev)
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;
} }
...@@ -2825,7 +2826,7 @@ void hci_release_dev(struct hci_dev *hdev) ...@@ -2825,7 +2826,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->recv_event); kfree_skb(hdev->recv_event);
kfree(hdev); kfree(hdev);
......
...@@ -101,7 +101,7 @@ static bool hci_sock_gen_cookie(struct sock *sk) ...@@ -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) ...@@ -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);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment