AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

Bluetooth: Rename function bt_err to bt_to_errno

Browse Source 
Make it easier to use more normal logging styles later.

Signed-off-by: Joe Perches <joe@perches.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
This commit is contained in:
Joe Perches 2011-06-29 18:18:29 -07:00 committed by Gustavo F. Padovan
parent 942ecc9c46
commit e175072f37
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/net/bluetooth/bluetooth.h
View File

@ -204,7 +204,7 @@ static inline struct sk_buff *bt_skb_send_alloc(struct sock *sk,
return NULL;
}
int bt_err(__u16 code);
int bt_to_errno(__u16 code);
extern int hci_sock_init(void);
extern void hci_sock_cleanup(void);

2
net/bluetooth/hci_core.c
View File

@ -148,7 +148,7 @@ static int __hci_request(struct hci_dev *hdev, void (*req)(struct hci_dev *hdev,
switch (hdev->req_status) {
case HCI_REQ_DONE:
err = -bt_err(hdev->req_result);
err = -bt_to_errno(hdev->req_result);
break;
case HCI_REQ_CANCELED:

4
net/bluetooth/l2cap_core.c
View File

@ -4107,7 +4107,7 @@ static int l2cap_connect_cfm(struct hci_conn *hcon, u8 status)
if (conn)
l2cap_conn_ready(conn);
} else
l2cap_conn_del(hcon, bt_err(status));
l2cap_conn_del(hcon, bt_to_errno(status));
return 0;
}
@ -4131,7 +4131,7 @@ static int l2cap_disconn_cfm(struct hci_conn *hcon, u8 reason)
if (!(hcon->type == ACL_LINK || hcon->type == LE_LINK))
return -EINVAL;
l2cap_conn_del(hcon, bt_err(reason));
l2cap_conn_del(hcon, bt_to_errno(reason));
return 0;
}

4
net/bluetooth/lib.c
View File

@ -59,7 +59,7 @@ char *batostr(bdaddr_t *ba)
EXPORT_SYMBOL(batostr);
/* Bluetooth error codes to Unix errno mapping */
int bt_err(__u16 code)
int bt_to_errno(__u16 code)
{
switch (code) {
case 0:
@ -149,4 +149,4 @@ int bt_err(__u16 code)
return ENOSYS;
}
}
EXPORT_SYMBOL(bt_err);
EXPORT_SYMBOL(bt_to_errno);

4
net/bluetooth/sco.c
View File

@ -932,7 +932,7 @@ static int sco_connect_cfm(struct hci_conn *hcon, __u8 status)
if (conn)
sco_conn_ready(conn);
} else
sco_conn_del(hcon, bt_err(status));
sco_conn_del(hcon, bt_to_errno(status));
return 0;
}
@ -944,7 +944,7 @@ static int sco_disconn_cfm(struct hci_conn *hcon, __u8 reason)
if (hcon->type != SCO_LINK && hcon->type != ESCO_LINK)
return -EINVAL;
sco_conn_del(hcon, bt_err(reason));
sco_conn_del(hcon, bt_to_errno(reason));
return 0;
}