aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorGustavo Padovan <gustavo.padovan@collabora.co.uk>2012-05-23 03:04:18 -0400
committerJohan Hedberg <johan.hedberg@intel.com>2012-06-04 23:34:07 -0400
commit6039aa73a1323edc2d6d93a22505d4dc28f38e3f (patch)
treefd1e0de2e823a0fa53234685cd21bf0f5e4b1a4d /net/bluetooth
parent4f42a8cd4905e69ba4dd694d9338aeee1bb7e9ab (diff)
Bluetooth: Remove most of the inline usage
Only obvious cases were left as inline, mostly oneline functions. Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk> Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/bnep/core.c4
-rw-r--r--net/bluetooth/bnep/netdev.c6
-rw-r--r--net/bluetooth/hci_core.c33
-rw-r--r--net/bluetooth/hci_event.c144
-rw-r--r--net/bluetooth/hci_sock.c6
-rw-r--r--net/bluetooth/hidp/core.c4
-rw-r--r--net/bluetooth/mgmt.c2
-rw-r--r--net/bluetooth/rfcomm/core.c18
-rw-r--r--net/bluetooth/rfcomm/tty.c4
-rw-r--r--net/bluetooth/sco.c9
10 files changed, 104 insertions, 126 deletions
diff --git a/net/bluetooth/bnep/core.c b/net/bluetooth/bnep/core.c
index 031d7d656754..a918f6e4f003 100644
--- a/net/bluetooth/bnep/core.c
+++ b/net/bluetooth/bnep/core.c
@@ -306,7 +306,7 @@ static u8 __bnep_rx_hlen[] = {
306 ETH_ALEN + 2 /* BNEP_COMPRESSED_DST_ONLY */ 306 ETH_ALEN + 2 /* BNEP_COMPRESSED_DST_ONLY */
307}; 307};
308 308
309static inline int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb) 309static int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb)
310{ 310{
311 struct net_device *dev = s->dev; 311 struct net_device *dev = s->dev;
312 struct sk_buff *nskb; 312 struct sk_buff *nskb;
@@ -404,7 +404,7 @@ static u8 __bnep_tx_types[] = {
404 BNEP_COMPRESSED 404 BNEP_COMPRESSED
405}; 405};
406 406
407static inline int bnep_tx_frame(struct bnep_session *s, struct sk_buff *skb) 407static int bnep_tx_frame(struct bnep_session *s, struct sk_buff *skb)
408{ 408{
409 struct ethhdr *eh = (void *) skb->data; 409 struct ethhdr *eh = (void *) skb->data;
410 struct socket *sock = s->sock; 410 struct socket *sock = s->sock;
diff --git a/net/bluetooth/bnep/netdev.c b/net/bluetooth/bnep/netdev.c
index bc4086480d97..46c9ece7b04a 100644
--- a/net/bluetooth/bnep/netdev.c
+++ b/net/bluetooth/bnep/netdev.c
@@ -128,7 +128,7 @@ static void bnep_net_timeout(struct net_device *dev)
128} 128}
129 129
130#ifdef CONFIG_BT_BNEP_MC_FILTER 130#ifdef CONFIG_BT_BNEP_MC_FILTER
131static inline int bnep_net_mc_filter(struct sk_buff *skb, struct bnep_session *s) 131static int bnep_net_mc_filter(struct sk_buff *skb, struct bnep_session *s)
132{ 132{
133 struct ethhdr *eh = (void *) skb->data; 133 struct ethhdr *eh = (void *) skb->data;
134 134
@@ -140,7 +140,7 @@ static inline int bnep_net_mc_filter(struct sk_buff *skb, struct bnep_session *s
140 140
141#ifdef CONFIG_BT_BNEP_PROTO_FILTER 141#ifdef CONFIG_BT_BNEP_PROTO_FILTER
142/* Determine ether protocol. Based on eth_type_trans. */ 142/* Determine ether protocol. Based on eth_type_trans. */
143static inline u16 bnep_net_eth_proto(struct sk_buff *skb) 143static u16 bnep_net_eth_proto(struct sk_buff *skb)
144{ 144{
145 struct ethhdr *eh = (void *) skb->data; 145 struct ethhdr *eh = (void *) skb->data;
146 u16 proto = ntohs(eh->h_proto); 146 u16 proto = ntohs(eh->h_proto);
@@ -154,7 +154,7 @@ static inline u16 bnep_net_eth_proto(struct sk_buff *skb)
154 return ETH_P_802_2; 154 return ETH_P_802_2;
155} 155}
156 156
157static inline int bnep_net_proto_filter(struct sk_buff *skb, struct bnep_session *s) 157static int bnep_net_proto_filter(struct sk_buff *skb, struct bnep_session *s)
158{ 158{
159 u16 proto = bnep_net_eth_proto(skb); 159 u16 proto = bnep_net_eth_proto(skb);
160 struct bnep_proto_filter *f = s->proto_filter; 160 struct bnep_proto_filter *f = s->proto_filter;
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index 027257d4b52a..2dc61d38bf62 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -167,8 +167,9 @@ static int __hci_request(struct hci_dev *hdev,
167 return err; 167 return err;
168} 168}
169 169
170static inline int hci_request(struct hci_dev *hdev, void (*req)(struct hci_dev *hdev, unsigned long opt), 170static int hci_request(struct hci_dev *hdev,
171 unsigned long opt, __u32 timeout) 171 void (*req)(struct hci_dev *hdev, unsigned long opt),
172 unsigned long opt, __u32 timeout)
172{ 173{
173 int ret; 174 int ret;
174 175
@@ -2245,8 +2246,8 @@ EXPORT_SYMBOL(hci_send_sco);
2245/* ---- HCI TX task (outgoing data) ---- */ 2246/* ---- HCI TX task (outgoing data) ---- */
2246 2247
2247/* HCI Connection scheduler */ 2248/* HCI Connection scheduler */
2248static inline struct hci_conn *hci_low_sent(struct hci_dev *hdev, __u8 type, 2249static struct hci_conn *hci_low_sent(struct hci_dev *hdev, __u8 type,
2249 int *quote) 2250 int *quote)
2250{ 2251{
2251 struct hci_conn_hash *h = &hdev->conn_hash; 2252 struct hci_conn_hash *h = &hdev->conn_hash;
2252 struct hci_conn *conn = NULL, *c; 2253 struct hci_conn *conn = NULL, *c;
@@ -2305,7 +2306,7 @@ static inline struct hci_conn *hci_low_sent(struct hci_dev *hdev, __u8 type,
2305 return conn; 2306 return conn;
2306} 2307}
2307 2308
2308static inline void hci_link_tx_to(struct hci_dev *hdev, __u8 type) 2309static void hci_link_tx_to(struct hci_dev *hdev, __u8 type)
2309{ 2310{
2310 struct hci_conn_hash *h = &hdev->conn_hash; 2311 struct hci_conn_hash *h = &hdev->conn_hash;
2311 struct hci_conn *c; 2312 struct hci_conn *c;
@@ -2326,8 +2327,8 @@ static inline void hci_link_tx_to(struct hci_dev *hdev, __u8 type)
2326 rcu_read_unlock(); 2327 rcu_read_unlock();
2327} 2328}
2328 2329
2329static inline struct hci_chan *hci_chan_sent(struct hci_dev *hdev, __u8 type, 2330static struct hci_chan *hci_chan_sent(struct hci_dev *hdev, __u8 type,
2330 int *quote) 2331 int *quote)
2331{ 2332{
2332 struct hci_conn_hash *h = &hdev->conn_hash; 2333 struct hci_conn_hash *h = &hdev->conn_hash;
2333 struct hci_chan *chan = NULL; 2334 struct hci_chan *chan = NULL;
@@ -2461,7 +2462,7 @@ static inline int __get_blocks(struct hci_dev *hdev, struct sk_buff *skb)
2461 return DIV_ROUND_UP(skb->len - HCI_ACL_HDR_SIZE, hdev->block_len); 2462 return DIV_ROUND_UP(skb->len - HCI_ACL_HDR_SIZE, hdev->block_len);
2462} 2463}
2463 2464
2464static inline void __check_timeout(struct hci_dev *hdev, unsigned int cnt) 2465static void __check_timeout(struct hci_dev *hdev, unsigned int cnt)
2465{ 2466{
2466 if (!test_bit(HCI_RAW, &hdev->flags)) { 2467 if (!test_bit(HCI_RAW, &hdev->flags)) {
2467 /* ACL tx timeout must be longer than maximum 2468 /* ACL tx timeout must be longer than maximum
@@ -2472,7 +2473,7 @@ static inline void __check_timeout(struct hci_dev *hdev, unsigned int cnt)
2472 } 2473 }
2473} 2474}
2474 2475
2475static inline void hci_sched_acl_pkt(struct hci_dev *hdev) 2476static void hci_sched_acl_pkt(struct hci_dev *hdev)
2476{ 2477{
2477 unsigned int cnt = hdev->acl_cnt; 2478 unsigned int cnt = hdev->acl_cnt;
2478 struct hci_chan *chan; 2479 struct hci_chan *chan;
@@ -2510,7 +2511,7 @@ static inline void hci_sched_acl_pkt(struct hci_dev *hdev)
2510 hci_prio_recalculate(hdev, ACL_LINK); 2511 hci_prio_recalculate(hdev, ACL_LINK);
2511} 2512}
2512 2513
2513static inline void hci_sched_acl_blk(struct hci_dev *hdev) 2514static void hci_sched_acl_blk(struct hci_dev *hdev)
2514{ 2515{
2515 unsigned int cnt = hdev->block_cnt; 2516 unsigned int cnt = hdev->block_cnt;
2516 struct hci_chan *chan; 2517 struct hci_chan *chan;
@@ -2556,7 +2557,7 @@ static inline void hci_sched_acl_blk(struct hci_dev *hdev)
2556 hci_prio_recalculate(hdev, ACL_LINK); 2557 hci_prio_recalculate(hdev, ACL_LINK);
2557} 2558}
2558 2559
2559static inline void hci_sched_acl(struct hci_dev *hdev) 2560static void hci_sched_acl(struct hci_dev *hdev)
2560{ 2561{
2561 BT_DBG("%s", hdev->name); 2562 BT_DBG("%s", hdev->name);
2562 2563
@@ -2575,7 +2576,7 @@ static inline void hci_sched_acl(struct hci_dev *hdev)
2575} 2576}
2576 2577
2577/* Schedule SCO */ 2578/* Schedule SCO */
2578static inline void hci_sched_sco(struct hci_dev *hdev) 2579static void hci_sched_sco(struct hci_dev *hdev)
2579{ 2580{
2580 struct hci_conn *conn; 2581 struct hci_conn *conn;
2581 struct sk_buff *skb; 2582 struct sk_buff *skb;
@@ -2598,7 +2599,7 @@ static inline void hci_sched_sco(struct hci_dev *hdev)
2598 } 2599 }
2599} 2600}
2600 2601
2601static inline void hci_sched_esco(struct hci_dev *hdev) 2602static void hci_sched_esco(struct hci_dev *hdev)
2602{ 2603{
2603 struct hci_conn *conn; 2604 struct hci_conn *conn;
2604 struct sk_buff *skb; 2605 struct sk_buff *skb;
@@ -2621,7 +2622,7 @@ static inline void hci_sched_esco(struct hci_dev *hdev)
2621 } 2622 }
2622} 2623}
2623 2624
2624static inline void hci_sched_le(struct hci_dev *hdev) 2625static void hci_sched_le(struct hci_dev *hdev)
2625{ 2626{
2626 struct hci_chan *chan; 2627 struct hci_chan *chan;
2627 struct sk_buff *skb; 2628 struct sk_buff *skb;
@@ -2698,7 +2699,7 @@ static void hci_tx_work(struct work_struct *work)
2698/* ----- HCI RX task (incoming data processing) ----- */ 2699/* ----- HCI RX task (incoming data processing) ----- */
2699 2700
2700/* ACL data packet */ 2701/* ACL data packet */
2701static inline void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb) 2702static void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb)
2702{ 2703{
2703 struct hci_acl_hdr *hdr = (void *) skb->data; 2704 struct hci_acl_hdr *hdr = (void *) skb->data;
2704 struct hci_conn *conn; 2705 struct hci_conn *conn;
@@ -2742,7 +2743,7 @@ static inline void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb)
2742} 2743}
2743 2744
2744/* SCO data packet */ 2745/* SCO data packet */
2745static inline void hci_scodata_packet(struct hci_dev *hdev, struct sk_buff *skb) 2746static void hci_scodata_packet(struct hci_dev *hdev, struct sk_buff *skb)
2746{ 2747{
2747 struct hci_sco_hdr *hdr = (void *) skb->data; 2748 struct hci_sco_hdr *hdr = (void *) skb->data;
2748 struct hci_conn *conn; 2749 struct hci_conn *conn;
diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index 1795c0c9b411..75b03fc78002 100644
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -1157,8 +1157,8 @@ static void hci_cc_le_ltk_neg_reply(struct hci_dev *hdev, struct sk_buff *skb)
1157 hci_req_complete(hdev, HCI_OP_LE_LTK_NEG_REPLY, rp->status); 1157 hci_req_complete(hdev, HCI_OP_LE_LTK_NEG_REPLY, rp->status);
1158} 1158}
1159 1159
1160static inline void hci_cc_write_le_host_supported(struct hci_dev *hdev, 1160static void hci_cc_write_le_host_supported(struct hci_dev *hdev,
1161 struct sk_buff *skb) 1161 struct sk_buff *skb)
1162{ 1162{
1163 struct hci_cp_write_le_host_supported *sent; 1163 struct hci_cp_write_le_host_supported *sent;
1164 __u8 status = *((__u8 *) skb->data); 1164 __u8 status = *((__u8 *) skb->data);
@@ -1183,7 +1183,7 @@ static inline void hci_cc_write_le_host_supported(struct hci_dev *hdev,
1183 hci_req_complete(hdev, HCI_OP_WRITE_LE_HOST_SUPPORTED, status); 1183 hci_req_complete(hdev, HCI_OP_WRITE_LE_HOST_SUPPORTED, status);
1184} 1184}
1185 1185
1186static inline void hci_cs_inquiry(struct hci_dev *hdev, __u8 status) 1186static void hci_cs_inquiry(struct hci_dev *hdev, __u8 status)
1187{ 1187{
1188 BT_DBG("%s status 0x%x", hdev->name, status); 1188 BT_DBG("%s status 0x%x", hdev->name, status);
1189 1189
@@ -1204,7 +1204,7 @@ static inline void hci_cs_inquiry(struct hci_dev *hdev, __u8 status)
1204 hci_dev_unlock(hdev); 1204 hci_dev_unlock(hdev);
1205} 1205}
1206 1206
1207static inline void hci_cs_create_conn(struct hci_dev *hdev, __u8 status) 1207static void hci_cs_create_conn(struct hci_dev *hdev, __u8 status)
1208{ 1208{
1209 struct hci_cp_create_conn *cp; 1209 struct hci_cp_create_conn *cp;
1210 struct hci_conn *conn; 1210 struct hci_conn *conn;
@@ -1351,7 +1351,7 @@ static int hci_outgoing_auth_needed(struct hci_dev *hdev,
1351 return 1; 1351 return 1;
1352} 1352}
1353 1353
1354static inline int hci_resolve_name(struct hci_dev *hdev, 1354static int hci_resolve_name(struct hci_dev *hdev,
1355 struct inquiry_entry *e) 1355 struct inquiry_entry *e)
1356{ 1356{
1357 struct hci_cp_remote_name_req cp; 1357 struct hci_cp_remote_name_req cp;
@@ -1668,8 +1668,7 @@ static void hci_cs_le_start_enc(struct hci_dev *hdev, u8 status)
1668 BT_DBG("%s status 0x%x", hdev->name, status); 1668 BT_DBG("%s status 0x%x", hdev->name, status);
1669} 1669}
1670 1670
1671static inline void hci_inquiry_complete_evt(struct hci_dev *hdev, 1671static void hci_inquiry_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
1672 struct sk_buff *skb)
1673{ 1672{
1674 __u8 status = *((__u8 *) skb->data); 1673 __u8 status = *((__u8 *) skb->data);
1675 struct discovery_state *discov = &hdev->discovery; 1674 struct discovery_state *discov = &hdev->discovery;
@@ -1709,8 +1708,7 @@ unlock:
1709 hci_dev_unlock(hdev); 1708 hci_dev_unlock(hdev);
1710} 1709}
1711 1710
1712static inline void hci_inquiry_result_evt(struct hci_dev *hdev, 1711static void hci_inquiry_result_evt(struct hci_dev *hdev, struct sk_buff *skb)
1713 struct sk_buff *skb)
1714{ 1712{
1715 struct inquiry_data data; 1713 struct inquiry_data data;
1716 struct inquiry_info *info = (void *) (skb->data + 1); 1714 struct inquiry_info *info = (void *) (skb->data + 1);
@@ -1747,8 +1745,7 @@ static inline void hci_inquiry_result_evt(struct hci_dev *hdev,
1747 hci_dev_unlock(hdev); 1745 hci_dev_unlock(hdev);
1748} 1746}
1749 1747
1750static inline void hci_conn_complete_evt(struct hci_dev *hdev, 1748static void hci_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
1751 struct sk_buff *skb)
1752{ 1749{
1753 struct hci_ev_conn_complete *ev = (void *) skb->data; 1750 struct hci_ev_conn_complete *ev = (void *) skb->data;
1754 struct hci_conn *conn; 1751 struct hci_conn *conn;
@@ -1826,8 +1823,7 @@ unlock:
1826 hci_conn_check_pending(hdev); 1823 hci_conn_check_pending(hdev);
1827} 1824}
1828 1825
1829static inline void hci_conn_request_evt(struct hci_dev *hdev, 1826static void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
1830 struct sk_buff *skb)
1831{ 1827{
1832 struct hci_ev_conn_request *ev = (void *) skb->data; 1828 struct hci_ev_conn_request *ev = (void *) skb->data;
1833 int mask = hdev->link_mode; 1829 int mask = hdev->link_mode;
@@ -1901,8 +1897,7 @@ static inline void hci_conn_request_evt(struct hci_dev *hdev,
1901 } 1897 }
1902} 1898}
1903 1899
1904static inline void hci_disconn_complete_evt(struct hci_dev *hdev, 1900static void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
1905 struct sk_buff *skb)
1906{ 1901{
1907 struct hci_ev_disconn_complete *ev = (void *) skb->data; 1902 struct hci_ev_disconn_complete *ev = (void *) skb->data;
1908 struct hci_conn *conn; 1903 struct hci_conn *conn;
@@ -1939,8 +1934,7 @@ unlock:
1939 hci_dev_unlock(hdev); 1934 hci_dev_unlock(hdev);
1940} 1935}
1941 1936
1942static inline void hci_auth_complete_evt(struct hci_dev *hdev, 1937static void hci_auth_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
1943 struct sk_buff *skb)
1944{ 1938{
1945 struct hci_ev_auth_complete *ev = (void *) skb->data; 1939 struct hci_ev_auth_complete *ev = (void *) skb->data;
1946 struct hci_conn *conn; 1940 struct hci_conn *conn;
@@ -2006,7 +2000,7 @@ unlock:
2006 hci_dev_unlock(hdev); 2000 hci_dev_unlock(hdev);
2007} 2001}
2008 2002
2009static inline void hci_remote_name_evt(struct hci_dev *hdev, struct sk_buff *skb) 2003static void hci_remote_name_evt(struct hci_dev *hdev, struct sk_buff *skb)
2010{ 2004{
2011 struct hci_ev_remote_name *ev = (void *) skb->data; 2005 struct hci_ev_remote_name *ev = (void *) skb->data;
2012 struct hci_conn *conn; 2006 struct hci_conn *conn;
@@ -2045,8 +2039,7 @@ unlock:
2045 hci_dev_unlock(hdev); 2039 hci_dev_unlock(hdev);
2046} 2040}
2047 2041
2048static inline void hci_encrypt_change_evt(struct hci_dev *hdev, 2042static void hci_encrypt_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
2049 struct sk_buff *skb)
2050{ 2043{
2051 struct hci_ev_encrypt_change *ev = (void *) skb->data; 2044 struct hci_ev_encrypt_change *ev = (void *) skb->data;
2052 struct hci_conn *conn; 2045 struct hci_conn *conn;
@@ -2089,8 +2082,8 @@ unlock:
2089 hci_dev_unlock(hdev); 2082 hci_dev_unlock(hdev);
2090} 2083}
2091 2084
2092static inline void hci_change_link_key_complete_evt(struct hci_dev *hdev, 2085static void hci_change_link_key_complete_evt(struct hci_dev *hdev,
2093 struct sk_buff *skb) 2086 struct sk_buff *skb)
2094{ 2087{
2095 struct hci_ev_change_link_key_complete *ev = (void *) skb->data; 2088 struct hci_ev_change_link_key_complete *ev = (void *) skb->data;
2096 struct hci_conn *conn; 2089 struct hci_conn *conn;
@@ -2112,8 +2105,8 @@ static inline void hci_change_link_key_complete_evt(struct hci_dev *hdev,
2112 hci_dev_unlock(hdev); 2105 hci_dev_unlock(hdev);
2113} 2106}
2114 2107
2115static inline void hci_remote_features_evt(struct hci_dev *hdev, 2108static void hci_remote_features_evt(struct hci_dev *hdev,
2116 struct sk_buff *skb) 2109 struct sk_buff *skb)
2117{ 2110{
2118 struct hci_ev_remote_features *ev = (void *) skb->data; 2111 struct hci_ev_remote_features *ev = (void *) skb->data;
2119 struct hci_conn *conn; 2112 struct hci_conn *conn;
@@ -2162,20 +2155,18 @@ unlock:
2162 hci_dev_unlock(hdev); 2155 hci_dev_unlock(hdev);
2163} 2156}
2164 2157
2165static inline void hci_remote_version_evt(struct hci_dev *hdev, 2158static void hci_remote_version_evt(struct hci_dev *hdev, struct sk_buff *skb)
2166 struct sk_buff *skb)
2167{ 2159{
2168 BT_DBG("%s", hdev->name); 2160 BT_DBG("%s", hdev->name);
2169} 2161}
2170 2162
2171static inline void hci_qos_setup_complete_evt(struct hci_dev *hdev, 2163static void hci_qos_setup_complete_evt(struct hci_dev *hdev,
2172 struct sk_buff *skb) 2164 struct sk_buff *skb)
2173{ 2165{
2174 BT_DBG("%s", hdev->name); 2166 BT_DBG("%s", hdev->name);
2175} 2167}
2176 2168
2177static inline void hci_cmd_complete_evt(struct hci_dev *hdev, 2169static void hci_cmd_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
2178 struct sk_buff *skb)
2179{ 2170{
2180 struct hci_ev_cmd_complete *ev = (void *) skb->data; 2171 struct hci_ev_cmd_complete *ev = (void *) skb->data;
2181 __u16 opcode; 2172 __u16 opcode;
@@ -2396,7 +2387,7 @@ static inline void hci_cmd_complete_evt(struct hci_dev *hdev,
2396 } 2387 }
2397} 2388}
2398 2389
2399static inline void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb) 2390static void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb)
2400{ 2391{
2401 struct hci_ev_cmd_status *ev = (void *) skb->data; 2392 struct hci_ev_cmd_status *ev = (void *) skb->data;
2402 __u16 opcode; 2393 __u16 opcode;
@@ -2477,8 +2468,7 @@ static inline void hci_cmd_status_evt(struct hci_dev *hdev, struct sk_buff *skb)
2477 } 2468 }
2478} 2469}
2479 2470
2480static inline void hci_role_change_evt(struct hci_dev *hdev, 2471static void hci_role_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
2481 struct sk_buff *skb)
2482{ 2472{
2483 struct hci_ev_role_change *ev = (void *) skb->data; 2473 struct hci_ev_role_change *ev = (void *) skb->data;
2484 struct hci_conn *conn; 2474 struct hci_conn *conn;
@@ -2504,8 +2494,7 @@ static inline void hci_role_change_evt(struct hci_dev *hdev,
2504 hci_dev_unlock(hdev); 2494 hci_dev_unlock(hdev);
2505} 2495}
2506 2496
2507static inline void hci_num_comp_pkts_evt(struct hci_dev *hdev, 2497static void hci_num_comp_pkts_evt(struct hci_dev *hdev, struct sk_buff *skb)
2508 struct sk_buff *skb)
2509{ 2498{
2510 struct hci_ev_num_comp_pkts *ev = (void *) skb->data; 2499 struct hci_ev_num_comp_pkts *ev = (void *) skb->data;
2511 int i; 2500 int i;
@@ -2571,8 +2560,7 @@ static inline void hci_num_comp_pkts_evt(struct hci_dev *hdev,
2571 queue_work(hdev->workqueue, &hdev->tx_work); 2560 queue_work(hdev->workqueue, &hdev->tx_work);
2572} 2561}
2573 2562
2574static inline void hci_num_comp_blocks_evt(struct hci_dev *hdev, 2563static void hci_num_comp_blocks_evt(struct hci_dev *hdev, struct sk_buff *skb)
2575 struct sk_buff *skb)
2576{ 2564{
2577 struct hci_ev_num_comp_blocks *ev = (void *) skb->data; 2565 struct hci_ev_num_comp_blocks *ev = (void *) skb->data;
2578 int i; 2566 int i;
@@ -2621,8 +2609,7 @@ static inline void hci_num_comp_blocks_evt(struct hci_dev *hdev,
2621 queue_work(hdev->workqueue, &hdev->tx_work); 2609 queue_work(hdev->workqueue, &hdev->tx_work);
2622} 2610}
2623 2611
2624static inline void hci_mode_change_evt(struct hci_dev *hdev, 2612static void hci_mode_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
2625 struct sk_buff *skb)
2626{ 2613{
2627 struct hci_ev_mode_change *ev = (void *) skb->data; 2614 struct hci_ev_mode_change *ev = (void *) skb->data;
2628 struct hci_conn *conn; 2615 struct hci_conn *conn;
@@ -2650,8 +2637,7 @@ static inline void hci_mode_change_evt(struct hci_dev *hdev,
2650 hci_dev_unlock(hdev); 2637 hci_dev_unlock(hdev);
2651} 2638}
2652 2639
2653static inline void hci_pin_code_request_evt(struct hci_dev *hdev, 2640static void hci_pin_code_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
2654 struct sk_buff *skb)
2655{ 2641{
2656 struct hci_ev_pin_code_req *ev = (void *) skb->data; 2642 struct hci_ev_pin_code_req *ev = (void *) skb->data;
2657 struct hci_conn *conn; 2643 struct hci_conn *conn;
@@ -2688,8 +2674,7 @@ unlock:
2688 hci_dev_unlock(hdev); 2674 hci_dev_unlock(hdev);
2689} 2675}
2690 2676
2691static inline void hci_link_key_request_evt(struct hci_dev *hdev, 2677static void hci_link_key_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
2692 struct sk_buff *skb)
2693{ 2678{
2694 struct hci_ev_link_key_req *ev = (void *) skb->data; 2679 struct hci_ev_link_key_req *ev = (void *) skb->data;
2695 struct hci_cp_link_key_reply cp; 2680 struct hci_cp_link_key_reply cp;
@@ -2752,8 +2737,7 @@ not_found:
2752 hci_dev_unlock(hdev); 2737 hci_dev_unlock(hdev);
2753} 2738}
2754 2739
2755static inline void hci_link_key_notify_evt(struct hci_dev *hdev, 2740static void hci_link_key_notify_evt(struct hci_dev *hdev, struct sk_buff *skb)
2756 struct sk_buff *skb)
2757{ 2741{
2758 struct hci_ev_link_key_notify *ev = (void *) skb->data; 2742 struct hci_ev_link_key_notify *ev = (void *) skb->data;
2759 struct hci_conn *conn; 2743 struct hci_conn *conn;
@@ -2782,8 +2766,7 @@ static inline void hci_link_key_notify_evt(struct hci_dev *hdev,
2782 hci_dev_unlock(hdev); 2766 hci_dev_unlock(hdev);
2783} 2767}
2784 2768
2785static inline void hci_clock_offset_evt(struct hci_dev *hdev, 2769static void hci_clock_offset_evt(struct hci_dev *hdev, struct sk_buff *skb)
2786 struct sk_buff *skb)
2787{ 2770{
2788 struct hci_ev_clock_offset *ev = (void *) skb->data; 2771 struct hci_ev_clock_offset *ev = (void *) skb->data;
2789 struct hci_conn *conn; 2772 struct hci_conn *conn;
@@ -2806,8 +2789,7 @@ static inline void hci_clock_offset_evt(struct hci_dev *hdev,
2806 hci_dev_unlock(hdev); 2789 hci_dev_unlock(hdev);
2807} 2790}
2808 2791
2809static inline void hci_pkt_type_change_evt(struct hci_dev *hdev, 2792static void hci_pkt_type_change_evt(struct hci_dev *hdev, struct sk_buff *skb)
2810 struct sk_buff *skb)
2811{ 2793{
2812 struct hci_ev_pkt_type_change *ev = (void *) skb->data; 2794 struct hci_ev_pkt_type_change *ev = (void *) skb->data;
2813 struct hci_conn *conn; 2795 struct hci_conn *conn;
@@ -2823,8 +2805,7 @@ static inline void hci_pkt_type_change_evt(struct hci_dev *hdev,
2823 hci_dev_unlock(hdev); 2805 hci_dev_unlock(hdev);
2824} 2806}
2825 2807
2826static inline void hci_pscan_rep_mode_evt(struct hci_dev *hdev, 2808static void hci_pscan_rep_mode_evt(struct hci_dev *hdev, struct sk_buff *skb)
2827 struct sk_buff *skb)
2828{ 2809{
2829 struct hci_ev_pscan_rep_mode *ev = (void *) skb->data; 2810 struct hci_ev_pscan_rep_mode *ev = (void *) skb->data;
2830 struct inquiry_entry *ie; 2811 struct inquiry_entry *ie;
@@ -2842,8 +2823,8 @@ static inline void hci_pscan_rep_mode_evt(struct hci_dev *hdev,
2842 hci_dev_unlock(hdev); 2823 hci_dev_unlock(hdev);
2843} 2824}
2844 2825
2845static inline void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev, 2826static void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev,
2846 struct sk_buff *skb) 2827 struct sk_buff *skb)
2847{ 2828{
2848 struct inquiry_data data; 2829 struct inquiry_data data;
2849 int num_rsp = *((__u8 *) skb->data); 2830 int num_rsp = *((__u8 *) skb->data);
@@ -2902,8 +2883,8 @@ static inline void hci_inquiry_result_with_rssi_evt(struct hci_dev *hdev,
2902 hci_dev_unlock(hdev); 2883 hci_dev_unlock(hdev);
2903} 2884}
2904 2885
2905static inline void hci_remote_ext_features_evt(struct hci_dev *hdev, 2886static void hci_remote_ext_features_evt(struct hci_dev *hdev,
2906 struct sk_buff *skb) 2887 struct sk_buff *skb)
2907{ 2888{
2908 struct hci_ev_remote_ext_features *ev = (void *) skb->data; 2889 struct hci_ev_remote_ext_features *ev = (void *) skb->data;
2909 struct hci_conn *conn; 2890 struct hci_conn *conn;
@@ -2951,8 +2932,8 @@ unlock:
2951 hci_dev_unlock(hdev); 2932 hci_dev_unlock(hdev);
2952} 2933}
2953 2934
2954static inline void hci_sync_conn_complete_evt(struct hci_dev *hdev, 2935static void hci_sync_conn_complete_evt(struct hci_dev *hdev,
2955 struct sk_buff *skb) 2936 struct sk_buff *skb)
2956{ 2937{
2957 struct hci_ev_sync_conn_complete *ev = (void *) skb->data; 2938 struct hci_ev_sync_conn_complete *ev = (void *) skb->data;
2958 struct hci_conn *conn; 2939 struct hci_conn *conn;
@@ -3007,22 +2988,20 @@ unlock:
3007 hci_dev_unlock(hdev); 2988 hci_dev_unlock(hdev);
3008} 2989}
3009 2990
3010static inline void hci_sync_conn_changed_evt(struct hci_dev *hdev, 2991static void hci_sync_conn_changed_evt(struct hci_dev *hdev, struct sk_buff *skb)
3011 struct sk_buff *skb)
3012{ 2992{
3013 BT_DBG("%s", hdev->name); 2993 BT_DBG("%s", hdev->name);
3014} 2994}
3015 2995
3016static inline void hci_sniff_subrate_evt(struct hci_dev *hdev, 2996static void hci_sniff_subrate_evt(struct hci_dev *hdev, struct sk_buff *skb)
3017 struct sk_buff *skb)
3018{ 2997{
3019 struct hci_ev_sniff_subrate *ev = (void *) skb->data; 2998 struct hci_ev_sniff_subrate *ev = (void *) skb->data;
3020 2999
3021 BT_DBG("%s status %d", hdev->name, ev->status); 3000 BT_DBG("%s status %d", hdev->name, ev->status);
3022} 3001}
3023 3002
3024static inline void hci_extended_inquiry_result_evt(struct hci_dev *hdev, 3003static void hci_extended_inquiry_result_evt(struct hci_dev *hdev,
3025 struct sk_buff *skb) 3004 struct sk_buff *skb)
3026{ 3005{
3027 struct inquiry_data data; 3006 struct inquiry_data data;
3028 struct extended_inquiry_info *info = (void *) (skb->data + 1); 3007 struct extended_inquiry_info *info = (void *) (skb->data + 1);
@@ -3069,7 +3048,7 @@ static inline void hci_extended_inquiry_result_evt(struct hci_dev *hdev,
3069 hci_dev_unlock(hdev); 3048 hci_dev_unlock(hdev);
3070} 3049}
3071 3050
3072static inline u8 hci_get_auth_req(struct hci_conn *conn) 3051static u8 hci_get_auth_req(struct hci_conn *conn)
3073{ 3052{
3074 /* If remote requests dedicated bonding follow that lead */ 3053 /* If remote requests dedicated bonding follow that lead */
3075 if (conn->remote_auth == 0x02 || conn->remote_auth == 0x03) { 3054 if (conn->remote_auth == 0x02 || conn->remote_auth == 0x03) {
@@ -3088,8 +3067,7 @@ static inline u8 hci_get_auth_req(struct hci_conn *conn)
3088 return conn->auth_type; 3067 return conn->auth_type;
3089} 3068}
3090 3069
3091static inline void hci_io_capa_request_evt(struct hci_dev *hdev, 3070static void hci_io_capa_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
3092 struct sk_buff *skb)
3093{ 3071{
3094 struct hci_ev_io_capa_request *ev = (void *) skb->data; 3072 struct hci_ev_io_capa_request *ev = (void *) skb->data;
3095 struct hci_conn *conn; 3073 struct hci_conn *conn;
@@ -3141,8 +3119,7 @@ unlock:
3141 hci_dev_unlock(hdev); 3119 hci_dev_unlock(hdev);
3142} 3120}
3143 3121
3144static inline void hci_io_capa_reply_evt(struct hci_dev *hdev, 3122static void hci_io_capa_reply_evt(struct hci_dev *hdev, struct sk_buff *skb)
3145 struct sk_buff *skb)
3146{ 3123{
3147 struct hci_ev_io_capa_reply *ev = (void *) skb->data; 3124 struct hci_ev_io_capa_reply *ev = (void *) skb->data;
3148 struct hci_conn *conn; 3125 struct hci_conn *conn;
@@ -3164,8 +3141,8 @@ unlock:
3164 hci_dev_unlock(hdev); 3141 hci_dev_unlock(hdev);
3165} 3142}
3166 3143
3167static inline void hci_user_confirm_request_evt(struct hci_dev *hdev, 3144static void hci_user_confirm_request_evt(struct hci_dev *hdev,
3168 struct sk_buff *skb) 3145 struct sk_buff *skb)
3169{ 3146{
3170 struct hci_ev_user_confirm_req *ev = (void *) skb->data; 3147 struct hci_ev_user_confirm_req *ev = (void *) skb->data;
3171 int loc_mitm, rem_mitm, confirm_hint = 0; 3148 int loc_mitm, rem_mitm, confirm_hint = 0;
@@ -3232,8 +3209,8 @@ unlock:
3232 hci_dev_unlock(hdev); 3209 hci_dev_unlock(hdev);
3233} 3210}
3234 3211
3235static inline void hci_user_passkey_request_evt(struct hci_dev *hdev, 3212static void hci_user_passkey_request_evt(struct hci_dev *hdev,
3236 struct sk_buff *skb) 3213 struct sk_buff *skb)
3237{ 3214{
3238 struct hci_ev_user_passkey_req *ev = (void *) skb->data; 3215 struct hci_ev_user_passkey_req *ev = (void *) skb->data;
3239 3216
@@ -3247,8 +3224,8 @@ static inline void hci_user_passkey_request_evt(struct hci_dev *hdev,
3247 hci_dev_unlock(hdev); 3224 hci_dev_unlock(hdev);
3248} 3225}
3249 3226
3250static inline void hci_simple_pair_complete_evt(struct hci_dev *hdev, 3227static void hci_simple_pair_complete_evt(struct hci_dev *hdev,
3251 struct sk_buff *skb) 3228 struct sk_buff *skb)
3252{ 3229{
3253 struct hci_ev_simple_pair_complete *ev = (void *) skb->data; 3230 struct hci_ev_simple_pair_complete *ev = (void *) skb->data;
3254 struct hci_conn *conn; 3231 struct hci_conn *conn;
@@ -3276,8 +3253,8 @@ unlock:
3276 hci_dev_unlock(hdev); 3253 hci_dev_unlock(hdev);
3277} 3254}
3278 3255
3279static inline void hci_remote_host_features_evt(struct hci_dev *hdev, 3256static void hci_remote_host_features_evt(struct hci_dev *hdev,
3280 struct sk_buff *skb) 3257 struct sk_buff *skb)
3281{ 3258{
3282 struct hci_ev_remote_host_features *ev = (void *) skb->data; 3259 struct hci_ev_remote_host_features *ev = (void *) skb->data;
3283 struct inquiry_entry *ie; 3260 struct inquiry_entry *ie;
@@ -3293,8 +3270,8 @@ static inline void hci_remote_host_features_evt(struct hci_dev *hdev,
3293 hci_dev_unlock(hdev); 3270 hci_dev_unlock(hdev);
3294} 3271}
3295 3272
3296static inline void hci_remote_oob_data_request_evt(struct hci_dev *hdev, 3273static void hci_remote_oob_data_request_evt(struct hci_dev *hdev,
3297 struct sk_buff *skb) 3274 struct sk_buff *skb)
3298{ 3275{
3299 struct hci_ev_remote_oob_data_request *ev = (void *) skb->data; 3276 struct hci_ev_remote_oob_data_request *ev = (void *) skb->data;
3300 struct oob_data *data; 3277 struct oob_data *data;
@@ -3328,8 +3305,7 @@ unlock:
3328 hci_dev_unlock(hdev); 3305 hci_dev_unlock(hdev);
3329} 3306}
3330 3307
3331static inline void hci_le_conn_complete_evt(struct hci_dev *hdev, 3308static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb)
3332 struct sk_buff *skb)
3333{ 3309{
3334 struct hci_ev_le_conn_complete *ev = (void *) skb->data; 3310 struct hci_ev_le_conn_complete *ev = (void *) skb->data;
3335 struct hci_conn *conn; 3311 struct hci_conn *conn;
@@ -3376,8 +3352,7 @@ unlock:
3376 hci_dev_unlock(hdev); 3352 hci_dev_unlock(hdev);
3377} 3353}
3378 3354
3379static inline void hci_le_adv_report_evt(struct hci_dev *hdev, 3355static void hci_le_adv_report_evt(struct hci_dev *hdev, struct sk_buff *skb)
3380 struct sk_buff *skb)
3381{ 3356{
3382 u8 num_reports = skb->data[0]; 3357 u8 num_reports = skb->data[0];
3383 void *ptr = &skb->data[1]; 3358 void *ptr = &skb->data[1];
@@ -3398,8 +3373,7 @@ static inline void hci_le_adv_report_evt(struct hci_dev *hdev,
3398 hci_dev_unlock(hdev); 3373 hci_dev_unlock(hdev);
3399} 3374}
3400 3375
3401static inline void hci_le_ltk_request_evt(struct hci_dev *hdev, 3376static void hci_le_ltk_request_evt(struct hci_dev *hdev, struct sk_buff *skb)
3402 struct sk_buff *skb)
3403{ 3377{
3404 struct hci_ev_le_ltk_req *ev = (void *) skb->data; 3378 struct hci_ev_le_ltk_req *ev = (void *) skb->data;
3405 struct hci_cp_le_ltk_reply cp; 3379 struct hci_cp_le_ltk_reply cp;
@@ -3442,7 +3416,7 @@ not_found:
3442 hci_dev_unlock(hdev); 3416 hci_dev_unlock(hdev);
3443} 3417}
3444 3418
3445static inline void hci_le_meta_evt(struct hci_dev *hdev, struct sk_buff *skb) 3419static void hci_le_meta_evt(struct hci_dev *hdev, struct sk_buff *skb)
3446{ 3420{
3447 struct hci_ev_le_meta *le_ev = (void *) skb->data; 3421 struct hci_ev_le_meta *le_ev = (void *) skb->data;
3448 3422
diff --git a/net/bluetooth/hci_sock.c b/net/bluetooth/hci_sock.c
index bdf51d1d2c19..89767ad095de 100644
--- a/net/bluetooth/hci_sock.c
+++ b/net/bluetooth/hci_sock.c
@@ -496,7 +496,8 @@ static int hci_sock_blacklist_del(struct hci_dev *hdev, void __user *arg)
496} 496}
497 497
498/* Ioctls that require bound socket */ 498/* Ioctls that require bound socket */
499static inline int hci_sock_bound_ioctl(struct sock *sk, unsigned int cmd, unsigned long arg) 499static int hci_sock_bound_ioctl(struct sock *sk, unsigned int cmd,
500 unsigned long arg)
500{ 501{
501 struct hci_dev *hdev = hci_pi(sk)->hdev; 502 struct hci_dev *hdev = hci_pi(sk)->hdev;
502 503
@@ -712,7 +713,8 @@ static int hci_sock_getname(struct socket *sock, struct sockaddr *addr, int *add
712 return 0; 713 return 0;
713} 714}
714 715
715static inline void hci_sock_cmsg(struct sock *sk, struct msghdr *msg, struct sk_buff *skb) 716static void hci_sock_cmsg(struct sock *sk, struct msghdr *msg,
717 struct sk_buff *skb)
716{ 718{
717 __u32 mask = hci_pi(sk)->cmsg_mask; 719 __u32 mask = hci_pi(sk)->cmsg_mask;
718 720
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index 2c20d765b394..c8625b8ccb6a 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -268,7 +268,7 @@ static int __hidp_send_ctrl_message(struct hidp_session *session,
268 return 0; 268 return 0;
269} 269}
270 270
271static inline int hidp_send_ctrl_message(struct hidp_session *session, 271static int hidp_send_ctrl_message(struct hidp_session *session,
272 unsigned char hdr, unsigned char *data, int size) 272 unsigned char hdr, unsigned char *data, int size)
273{ 273{
274 int err; 274 int err;
@@ -471,7 +471,7 @@ static void hidp_set_timer(struct hidp_session *session)
471 mod_timer(&session->timer, jiffies + HZ * session->idle_to); 471 mod_timer(&session->timer, jiffies + HZ * session->idle_to);
472} 472}
473 473
474static inline void hidp_del_timer(struct hidp_session *session) 474static void hidp_del_timer(struct hidp_session *session)
475{ 475{
476 if (session->idle_to > 0) 476 if (session->idle_to > 0)
477 del_timer(&session->timer); 477 del_timer(&session->timer);
diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 1fd49e652694..df03c7d20331 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -1821,7 +1821,7 @@ static int set_io_capability(struct sock *sk, struct hci_dev *hdev, void *data,
1821 0); 1821 0);
1822} 1822}
1823 1823
1824static inline struct pending_cmd *find_pairing(struct hci_conn *conn) 1824static struct pending_cmd *find_pairing(struct hci_conn *conn)
1825{ 1825{
1826 struct hci_dev *hdev = conn->hdev; 1826 struct hci_dev *hdev = conn->hdev;
1827 struct pending_cmd *cmd; 1827 struct pending_cmd *cmd;
diff --git a/net/bluetooth/rfcomm/core.c b/net/bluetooth/rfcomm/core.c
index 8a602388f1e7..585d3916d3d4 100644
--- a/net/bluetooth/rfcomm/core.c
+++ b/net/bluetooth/rfcomm/core.c
@@ -115,14 +115,14 @@ static void rfcomm_session_del(struct rfcomm_session *s);
115#define __get_rpn_stop_bits(line) (((line) >> 2) & 0x1) 115#define __get_rpn_stop_bits(line) (((line) >> 2) & 0x1)
116#define __get_rpn_parity(line) (((line) >> 3) & 0x7) 116#define __get_rpn_parity(line) (((line) >> 3) & 0x7)
117 117
118static inline void rfcomm_schedule(void) 118static void rfcomm_schedule(void)
119{ 119{
120 if (!rfcomm_thread) 120 if (!rfcomm_thread)
121 return; 121 return;
122 wake_up_process(rfcomm_thread); 122 wake_up_process(rfcomm_thread);
123} 123}
124 124
125static inline void rfcomm_session_put(struct rfcomm_session *s) 125static void rfcomm_session_put(struct rfcomm_session *s)
126{ 126{
127 if (atomic_dec_and_test(&s->refcnt)) 127 if (atomic_dec_and_test(&s->refcnt))
128 rfcomm_session_del(s); 128 rfcomm_session_del(s);
@@ -227,7 +227,7 @@ static int rfcomm_l2sock_create(struct socket **sock)
227 return err; 227 return err;
228} 228}
229 229
230static inline int rfcomm_check_security(struct rfcomm_dlc *d) 230static int rfcomm_check_security(struct rfcomm_dlc *d)
231{ 231{
232 struct sock *sk = d->session->sock->sk; 232 struct sock *sk = d->session->sock->sk;
233 struct l2cap_conn *conn = l2cap_pi(sk)->chan->conn; 233 struct l2cap_conn *conn = l2cap_pi(sk)->chan->conn;
@@ -1750,7 +1750,7 @@ static void rfcomm_process_connect(struct rfcomm_session *s)
1750/* Send data queued for the DLC. 1750/* Send data queued for the DLC.
1751 * Return number of frames left in the queue. 1751 * Return number of frames left in the queue.
1752 */ 1752 */
1753static inline int rfcomm_process_tx(struct rfcomm_dlc *d) 1753static int rfcomm_process_tx(struct rfcomm_dlc *d)
1754{ 1754{
1755 struct sk_buff *skb; 1755 struct sk_buff *skb;
1756 int err; 1756 int err;
@@ -1798,7 +1798,7 @@ static inline int rfcomm_process_tx(struct rfcomm_dlc *d)
1798 return skb_queue_len(&d->tx_queue); 1798 return skb_queue_len(&d->tx_queue);
1799} 1799}
1800 1800
1801static inline void rfcomm_process_dlcs(struct rfcomm_session *s) 1801static void rfcomm_process_dlcs(struct rfcomm_session *s)
1802{ 1802{
1803 struct rfcomm_dlc *d; 1803 struct rfcomm_dlc *d;
1804 struct list_head *p, *n; 1804 struct list_head *p, *n;
@@ -1858,7 +1858,7 @@ static inline void rfcomm_process_dlcs(struct rfcomm_session *s)
1858 } 1858 }
1859} 1859}
1860 1860
1861static inline void rfcomm_process_rx(struct rfcomm_session *s) 1861static void rfcomm_process_rx(struct rfcomm_session *s)
1862{ 1862{
1863 struct socket *sock = s->sock; 1863 struct socket *sock = s->sock;
1864 struct sock *sk = sock->sk; 1864 struct sock *sk = sock->sk;
@@ -1883,7 +1883,7 @@ static inline void rfcomm_process_rx(struct rfcomm_session *s)
1883 } 1883 }
1884} 1884}
1885 1885
1886static inline void rfcomm_accept_connection(struct rfcomm_session *s) 1886static void rfcomm_accept_connection(struct rfcomm_session *s)
1887{ 1887{
1888 struct socket *sock = s->sock, *nsock; 1888 struct socket *sock = s->sock, *nsock;
1889 int err; 1889 int err;
@@ -1917,7 +1917,7 @@ static inline void rfcomm_accept_connection(struct rfcomm_session *s)
1917 sock_release(nsock); 1917 sock_release(nsock);
1918} 1918}
1919 1919
1920static inline void rfcomm_check_connection(struct rfcomm_session *s) 1920static void rfcomm_check_connection(struct rfcomm_session *s)
1921{ 1921{
1922 struct sock *sk = s->sock->sk; 1922 struct sock *sk = s->sock->sk;
1923 1923
@@ -1941,7 +1941,7 @@ static inline void rfcomm_check_connection(struct rfcomm_session *s)
1941 } 1941 }
1942} 1942}
1943 1943
1944static inline void rfcomm_process_sessions(void) 1944static void rfcomm_process_sessions(void)
1945{ 1945{
1946 struct list_head *p, *n; 1946 struct list_head *p, *n;
1947 1947
diff --git a/net/bluetooth/rfcomm/tty.c b/net/bluetooth/rfcomm/tty.c
index d1820ff14aee..f2f4d064df94 100644
--- a/net/bluetooth/rfcomm/tty.c
+++ b/net/bluetooth/rfcomm/tty.c
@@ -132,7 +132,7 @@ static struct rfcomm_dev *__rfcomm_dev_get(int id)
132 return NULL; 132 return NULL;
133} 133}
134 134
135static inline struct rfcomm_dev *rfcomm_dev_get(int id) 135static struct rfcomm_dev *rfcomm_dev_get(int id)
136{ 136{
137 struct rfcomm_dev *dev; 137 struct rfcomm_dev *dev;
138 138
@@ -345,7 +345,7 @@ static void rfcomm_wfree(struct sk_buff *skb)
345 tty_port_put(&dev->port); 345 tty_port_put(&dev->port);
346} 346}
347 347
348static inline void rfcomm_set_owner_w(struct sk_buff *skb, struct rfcomm_dev *dev) 348static void rfcomm_set_owner_w(struct sk_buff *skb, struct rfcomm_dev *dev)
349{ 349{
350 tty_port_get(&dev->port); 350 tty_port_get(&dev->port);
351 atomic_add(skb->truesize, &dev->wmem_alloc); 351 atomic_add(skb->truesize, &dev->wmem_alloc);
diff --git a/net/bluetooth/sco.c b/net/bluetooth/sco.c
index 78473ff7cc8d..824ae2fd15eb 100644
--- a/net/bluetooth/sco.c
+++ b/net/bluetooth/sco.c
@@ -123,7 +123,7 @@ static struct sco_conn *sco_conn_add(struct hci_conn *hcon)
123 return conn; 123 return conn;
124} 124}
125 125
126static inline struct sock *sco_chan_get(struct sco_conn *conn) 126static struct sock *sco_chan_get(struct sco_conn *conn)
127{ 127{
128 struct sock *sk = NULL; 128 struct sock *sk = NULL;
129 sco_conn_lock(conn); 129 sco_conn_lock(conn);
@@ -157,7 +157,8 @@ static int sco_conn_del(struct hci_conn *hcon, int err)
157 return 0; 157 return 0;
158} 158}
159 159
160static inline int sco_chan_add(struct sco_conn *conn, struct sock *sk, struct sock *parent) 160static int sco_chan_add(struct sco_conn *conn, struct sock *sk,
161 struct sock *parent)
161{ 162{
162 int err = 0; 163 int err = 0;
163 164
@@ -228,7 +229,7 @@ done:
228 return err; 229 return err;
229} 230}
230 231
231static inline int sco_send_frame(struct sock *sk, struct msghdr *msg, int len) 232static int sco_send_frame(struct sock *sk, struct msghdr *msg, int len)
232{ 233{
233 struct sco_conn *conn = sco_pi(sk)->conn; 234 struct sco_conn *conn = sco_pi(sk)->conn;
234 struct sk_buff *skb; 235 struct sk_buff *skb;
@@ -254,7 +255,7 @@ static inline int sco_send_frame(struct sock *sk, struct msghdr *msg, int len)
254 return len; 255 return len;
255} 256}
256 257
257static inline void sco_recv_frame(struct sco_conn *conn, struct sk_buff *skb) 258static void sco_recv_frame(struct sco_conn *conn, struct sk_buff *skb)
258{ 259{
259 struct sock *sk = sco_chan_get(conn); 260 struct sock *sk = sco_chan_get(conn);
260 261
generated by cgit v1.2.2 (git 2.25.0) at 2025-03-08 22:24:53 -0500