evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bluetooth: remove *_bh usage from hci_dev_list and hci_cb_list

Browse source 
They don't need to disable interrupts anymore, we only run in process
context now.

Acked-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
This commit is contained in:
Gustavo F. Padovan 2011-12-22 16:30:27 -02:00
parent 460da45d92
commit f20d09d5f7
3 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
include/net/bluetooth/hci_core.h
View file

@ -801,13 +801,13 @@ static inline void hci_auth_cfm(struct hci_conn *conn, __u8 status)
encrypt = (conn->link_mode & HCI_LM_ENCRYPT) ? 0x01 : 0x00; encrypt = (conn->link_mode & HCI_LM_ENCRYPT) ? 0x01 : 0x00;
read_lock_bh(&hci_cb_list_lock); read_lock(&hci_cb_list_lock);
list_for_each(p, &hci_cb_list) { list_for_each(p, &hci_cb_list) {
struct hci_cb *cb = list_entry(p, struct hci_cb, list); struct hci_cb *cb = list_entry(p, struct hci_cb, list);
if (cb->security_cfm) if (cb->security_cfm)
cb->security_cfm(conn, status, encrypt); cb->security_cfm(conn, status, encrypt);
} }
read_unlock_bh(&hci_cb_list_lock); read_unlock(&hci_cb_list_lock);
} }
static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status, static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status,
@ -823,26 +823,26 @@ static inline void hci_encrypt_cfm(struct hci_conn *conn, __u8 status,
hci_proto_encrypt_cfm(conn, status, encrypt); hci_proto_encrypt_cfm(conn, status, encrypt);
read_lock_bh(&hci_cb_list_lock); read_lock(&hci_cb_list_lock);
list_for_each(p, &hci_cb_list) { list_for_each(p, &hci_cb_list) {
struct hci_cb *cb = list_entry(p, struct hci_cb, list); struct hci_cb *cb = list_entry(p, struct hci_cb, list);
if (cb->security_cfm) if (cb->security_cfm)
cb->security_cfm(conn, status, encrypt); cb->security_cfm(conn, status, encrypt);
} }
read_unlock_bh(&hci_cb_list_lock); read_unlock(&hci_cb_list_lock);
} }
static inline void hci_key_change_cfm(struct hci_conn *conn, __u8 status) static inline void hci_key_change_cfm(struct hci_conn *conn, __u8 status)
{ {
struct list_head *p; struct list_head *p;
read_lock_bh(&hci_cb_list_lock); read_lock(&hci_cb_list_lock);
list_for_each(p, &hci_cb_list) { list_for_each(p, &hci_cb_list) {
struct hci_cb *cb = list_entry(p, struct hci_cb, list); struct hci_cb *cb = list_entry(p, struct hci_cb, list);
if (cb->key_change_cfm) if (cb->key_change_cfm)
cb->key_change_cfm(conn, status); cb->key_change_cfm(conn, status);
} }
read_unlock_bh(&hci_cb_list_lock); read_unlock(&hci_cb_list_lock);
} }
static inline void hci_role_switch_cfm(struct hci_conn *conn, __u8 status, static inline void hci_role_switch_cfm(struct hci_conn *conn, __u8 status,
@ -850,13 +850,13 @@ static inline void hci_role_switch_cfm(struct hci_conn *conn, __u8 status,
{ {
struct list_head *p; struct list_head *p;
read_lock_bh(&hci_cb_list_lock); read_lock(&hci_cb_list_lock);
list_for_each(p, &hci_cb_list) { list_for_each(p, &hci_cb_list) {
struct hci_cb *cb = list_entry(p, struct hci_cb, list); struct hci_cb *cb = list_entry(p, struct hci_cb, list);
if (cb->role_switch_cfm) if (cb->role_switch_cfm)
cb->role_switch_cfm(conn, status, role); cb->role_switch_cfm(conn, status, role);
} }
read_unlock_bh(&hci_cb_list_lock); read_unlock(&hci_cb_list_lock);
} }
int hci_register_cb(struct hci_cb *hcb); int hci_register_cb(struct hci_cb *hcb);

4
net/bluetooth/hci_conn.c
View file

@ -487,7 +487,7 @@ struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src)
BT_DBG("%s -> %s", batostr(src), batostr(dst)); BT_DBG("%s -> %s", batostr(src), batostr(dst));
read_lock_bh(&hci_dev_list_lock); read_lock(&hci_dev_list_lock);
list_for_each_entry(d, &hci_dev_list, list) { list_for_each_entry(d, &hci_dev_list, list) {
if (!test_bit(HCI_UP, &d->flags) || test_bit(HCI_RAW, &d->flags)) if (!test_bit(HCI_UP, &d->flags) || test_bit(HCI_RAW, &d->flags))
@ -512,7 +512,7 @@ struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src)
if (hdev) if (hdev)
hdev = hci_dev_hold(hdev); hdev = hci_dev_hold(hdev);
read_unlock_bh(&hci_dev_list_lock); read_unlock(&hci_dev_list_lock);
return hdev; return hdev;
} }
EXPORT_SYMBOL(hci_get_route); EXPORT_SYMBOL(hci_get_route);

24
net/bluetooth/hci_core.c
View file

@ -844,7 +844,7 @@ int hci_get_dev_list(void __user *arg)
dr = dl->dev_req; dr = dl->dev_req;
read_lock_bh(&hci_dev_list_lock); read_lock(&hci_dev_list_lock);
list_for_each_entry(hdev, &hci_dev_list, list) { list_for_each_entry(hdev, &hci_dev_list, list) {
if (test_and_clear_bit(HCI_AUTO_OFF, &hdev->flags)) if (test_and_clear_bit(HCI_AUTO_OFF, &hdev->flags))
cancel_delayed_work(&hdev->power_off); cancel_delayed_work(&hdev->power_off);
@ -858,7 +858,7 @@ int hci_get_dev_list(void __user *arg)
if (++n >= dev_num) if (++n >= dev_num)
break; break;
} }
read_unlock_bh(&hci_dev_list_lock); read_unlock(&hci_dev_list_lock);
dl->dev_num = n; dl->dev_num = n;
size = sizeof(*dl) + n * sizeof(*dr); size = sizeof(*dl) + n * sizeof(*dr);
@ -1458,7 +1458,7 @@ int hci_register_dev(struct hci_dev *hdev)
*/ */
id = (hdev->dev_type == HCI_BREDR) ? 0 : 1; id = (hdev->dev_type == HCI_BREDR) ? 0 : 1;
write_lock_bh(&hci_dev_list_lock); write_lock(&hci_dev_list_lock);
/* Find first available device id */ /* Find first available device id */
list_for_each(p, &hci_dev_list) { list_for_each(p, &hci_dev_list) {
@ -1528,7 +1528,7 @@ int hci_register_dev(struct hci_dev *hdev)
atomic_set(&hdev->promisc, 0); atomic_set(&hdev->promisc, 0);
write_unlock_bh(&hci_dev_list_lock); write_unlock(&hci_dev_list_lock);
hdev->workqueue = alloc_workqueue(hdev->name, WQ_HIGHPRI | WQ_UNBOUND | hdev->workqueue = alloc_workqueue(hdev->name, WQ_HIGHPRI | WQ_UNBOUND |
WQ_MEM_RECLAIM, 1); WQ_MEM_RECLAIM, 1);
@ -1561,9 +1561,9 @@ int hci_register_dev(struct hci_dev *hdev)
err_wqueue: err_wqueue:
destroy_workqueue(hdev->workqueue); destroy_workqueue(hdev->workqueue);
err: err:
write_lock_bh(&hci_dev_list_lock); write_lock(&hci_dev_list_lock);
list_del(&hdev->list); list_del(&hdev->list);
write_unlock_bh(&hci_dev_list_lock); write_unlock(&hci_dev_list_lock);
return error; return error;
} }
@ -1576,9 +1576,9 @@ void hci_unregister_dev(struct hci_dev *hdev)
BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus); BT_DBG("%p name %s bus %d", hdev, hdev->name, hdev->bus);
write_lock_bh(&hci_dev_list_lock); write_lock(&hci_dev_list_lock);
list_del(&hdev->list); list_del(&hdev->list);
write_unlock_bh(&hci_dev_list_lock); write_unlock(&hci_dev_list_lock);
hci_dev_do_close(hdev); hci_dev_do_close(hdev);
@ -1830,9 +1830,9 @@ int hci_register_cb(struct hci_cb *cb)
{ {
BT_DBG("%p name %s", cb, cb->name); BT_DBG("%p name %s", cb, cb->name);
write_lock_bh(&hci_cb_list_lock); write_lock(&hci_cb_list_lock);
list_add(&cb->list, &hci_cb_list); list_add(&cb->list, &hci_cb_list);
write_unlock_bh(&hci_cb_list_lock); write_unlock(&hci_cb_list_lock);
return 0; return 0;
} }
@ -1842,9 +1842,9 @@ int hci_unregister_cb(struct hci_cb *cb)
{ {
BT_DBG("%p name %s", cb, cb->name); BT_DBG("%p name %s", cb, cb->name);
write_lock_bh(&hci_cb_list_lock); write_lock(&hci_cb_list_lock);
list_del(&cb->list); list_del(&cb->list);
write_unlock_bh(&hci_cb_list_lock); write_unlock(&hci_cb_list_lock);
return 0; return 0;
} }