Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Gustavo Padovan and committed by
Johan Hedberg
6039aa73 4f42a8cd

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