Skip to content

L
linux
Commit 6039aa73 authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Johan Hedberg
Browse files
Options

Bluetooth: Remove most of the inline usage 

Only obvious cases were left as inline, mostly oneline functions.
Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 4f42a8cd
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 104 additions and 126 deletions
net/bluetooth/bnep/core.c
View file @ 6039aa73
...@@ -306,7 +306,7 @@ static u8 __bnep_rx_hlen[] = { ...@@ -306,7 +306,7 @@ static u8 __bnep_rx_hlen[] = {
ETH_ALEN + 2 /* BNEP_COMPRESSED_DST_ONLY */ ETH_ALEN + 2 /* BNEP_COMPRESSED_DST_ONLY */
}; };
static inline int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb) static int bnep_rx_frame(struct bnep_session *s, struct sk_buff *skb)
{ {
struct net_device *dev = s->dev; struct net_device *dev = s->dev;
struct sk_buff *nskb; struct sk_buff *nskb;
...@@ -404,7 +404,7 @@ static u8 __bnep_tx_types[] = { ...@@ -404,7 +404,7 @@ static u8 __bnep_tx_types[] = {
BNEP_COMPRESSED BNEP_COMPRESSED
}; };
static inline int bnep_tx_frame(struct bnep_session *s, struct sk_buff *skb) static int bnep_tx_frame(struct bnep_session *s, struct sk_buff *skb)
{ {
struct ethhdr *eh = (void *) skb->data; struct ethhdr *eh = (void *) skb->data;
struct socket *sock = s->sock; struct socket *sock = s->sock;
......
net/bluetooth/bnep/netdev.c
View file @ 6039aa73
...@@ -128,7 +128,7 @@ static void bnep_net_timeout(struct net_device *dev) ...@@ -128,7 +128,7 @@ static void bnep_net_timeout(struct net_device *dev)
} }
#ifdef CONFIG_BT_BNEP_MC_FILTER #ifdef CONFIG_BT_BNEP_MC_FILTER
static inline int bnep_net_mc_filter(struct sk_buff *skb, struct bnep_session *s) static int bnep_net_mc_filter(struct sk_buff *skb, struct bnep_session *s)
{ {
struct ethhdr *eh = (void *) skb->data; struct ethhdr *eh = (void *) skb->data;
...@@ -140,7 +140,7 @@ static inline int bnep_net_mc_filter(struct sk_buff *skb, struct bnep_session *s ...@@ -140,7 +140,7 @@ static inline int bnep_net_mc_filter(struct sk_buff *skb, struct bnep_session *s
#ifdef CONFIG_BT_BNEP_PROTO_FILTER #ifdef CONFIG_BT_BNEP_PROTO_FILTER
/* Determine ether protocol. Based on eth_type_trans. */ /* Determine ether protocol. Based on eth_type_trans. */
static inline u16 bnep_net_eth_proto(struct sk_buff *skb) static u16 bnep_net_eth_proto(struct sk_buff *skb)
{ {
struct ethhdr *eh = (void *) skb->data; struct ethhdr *eh = (void *) skb->data;
u16 proto = ntohs(eh->h_proto); u16 proto = ntohs(eh->h_proto);
...@@ -154,7 +154,7 @@ static inline u16 bnep_net_eth_proto(struct sk_buff *skb) ...@@ -154,7 +154,7 @@ static inline u16 bnep_net_eth_proto(struct sk_buff *skb)
return ETH_P_802_2; return ETH_P_802_2;
} }
static inline int bnep_net_proto_filter(struct sk_buff *skb, struct bnep_session *s) static int bnep_net_proto_filter(struct sk_buff *skb, struct bnep_session *s)
{ {
u16 proto = bnep_net_eth_proto(skb); u16 proto = bnep_net_eth_proto(skb);
struct bnep_proto_filter *f = s->proto_filter; struct bnep_proto_filter *f = s->proto_filter;
......
net/bluetooth/hci_core.c
View file @ 6039aa73
...@@ -167,8 +167,9 @@ static int __hci_request(struct hci_dev *hdev, ...@@ -167,8 +167,9 @@ static int __hci_request(struct hci_dev *hdev,
return err; return err;
} }
static inline int hci_request(struct hci_dev *hdev, void (*req)(struct hci_dev *hdev, unsigned long opt), static int hci_request(struct hci_dev *hdev,
unsigned long opt, __u32 timeout) void (*req)(struct hci_dev *hdev, unsigned long opt),
unsigned long opt, __u32 timeout)
{ {
int ret; int ret;
...@@ -2245,8 +2246,8 @@ EXPORT_SYMBOL(hci_send_sco); ...@@ -2245,8 +2246,8 @@ EXPORT_SYMBOL(hci_send_sco);
/* ---- HCI TX task (outgoing data) ---- */ /* ---- HCI TX task (outgoing data) ---- */
/* HCI Connection scheduler */ /* HCI Connection scheduler */
static inline struct hci_conn *hci_low_sent(struct hci_dev *hdev, __u8 type, static struct hci_conn *hci_low_sent(struct hci_dev *hdev, __u8 type,
int *quote) int *quote)
{ {
struct hci_conn_hash *h = &hdev->conn_hash; struct hci_conn_hash *h = &hdev->conn_hash;
struct hci_conn *conn = NULL, *c; 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,7 +2306,7 @@ static inline struct hci_conn *hci_low_sent(struct hci_dev *hdev, __u8 type,
return conn; return conn;
} }
static inline void hci_link_tx_to(struct hci_dev *hdev, __u8 type) static void hci_link_tx_to(struct hci_dev *hdev, __u8 type)
{ {
struct hci_conn_hash *h = &hdev->conn_hash; struct hci_conn_hash *h = &hdev->conn_hash;
struct hci_conn *c; struct hci_conn *c;
...@@ -2326,8 +2327,8 @@ static inline void hci_link_tx_to(struct hci_dev *hdev, __u8 type) ...@@ -2326,8 +2327,8 @@ static inline void hci_link_tx_to(struct hci_dev *hdev, __u8 type)
rcu_read_unlock(); rcu_read_unlock();
} }
static inline struct hci_chan *hci_chan_sent(struct hci_dev *hdev, __u8 type, static struct hci_chan *hci_chan_sent(struct hci_dev *hdev, __u8 type,
int *quote) int *quote)
{ {
struct hci_conn_hash *h = &hdev->conn_hash; struct hci_conn_hash *h = &hdev->conn_hash;
struct hci_chan *chan = NULL; struct hci_chan *chan = NULL;
...@@ -2461,7 +2462,7 @@ static inline int __get_blocks(struct hci_dev *hdev, struct sk_buff *skb) ...@@ -2461,7 +2462,7 @@ static inline int __get_blocks(struct hci_dev *hdev, struct sk_buff *skb)
return DIV_ROUND_UP(skb->len - HCI_ACL_HDR_SIZE, hdev->block_len); return DIV_ROUND_UP(skb->len - HCI_ACL_HDR_SIZE, hdev->block_len);
} }
static inline void __check_timeout(struct hci_dev *hdev, unsigned int cnt) static void __check_timeout(struct hci_dev *hdev, unsigned int cnt)
{ {
if (!test_bit(HCI_RAW, &hdev->flags)) { if (!test_bit(HCI_RAW, &hdev->flags)) {
/* ACL tx timeout must be longer than maximum /* 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,7 +2473,7 @@ static inline void __check_timeout(struct hci_dev *hdev, unsigned int cnt)
} }
} }
static inline void hci_sched_acl_pkt(struct hci_dev *hdev) static void hci_sched_acl_pkt(struct hci_dev *hdev)
{ {
unsigned int cnt = hdev->acl_cnt; unsigned int cnt = hdev->acl_cnt;
struct hci_chan *chan; struct hci_chan *chan;
...@@ -2510,7 +2511,7 @@ static inline void hci_sched_acl_pkt(struct hci_dev *hdev) ...@@ -2510,7 +2511,7 @@ static inline void hci_sched_acl_pkt(struct hci_dev *hdev)
hci_prio_recalculate(hdev, ACL_LINK); hci_prio_recalculate(hdev, ACL_LINK);
} }
static inline void hci_sched_acl_blk(struct hci_dev *hdev) static void hci_sched_acl_blk(struct hci_dev *hdev)
{ {
unsigned int cnt = hdev->block_cnt; unsigned int cnt = hdev->block_cnt;
struct hci_chan *chan; struct hci_chan *chan;
...@@ -2556,7 +2557,7 @@ static inline void hci_sched_acl_blk(struct hci_dev *hdev) ...@@ -2556,7 +2557,7 @@ static inline void hci_sched_acl_blk(struct hci_dev *hdev)
hci_prio_recalculate(hdev, ACL_LINK); hci_prio_recalculate(hdev, ACL_LINK);
} }
static inline void hci_sched_acl(struct hci_dev *hdev) static void hci_sched_acl(struct hci_dev *hdev)
{ {
BT_DBG("%s", hdev->name); BT_DBG("%s", hdev->name);
...@@ -2575,7 +2576,7 @@ static inline void hci_sched_acl(struct hci_dev *hdev) ...@@ -2575,7 +2576,7 @@ static inline void hci_sched_acl(struct hci_dev *hdev)
} }
/* Schedule SCO */ /* Schedule SCO */
static inline void hci_sched_sco(struct hci_dev *hdev) static void hci_sched_sco(struct hci_dev *hdev)
{ {
struct hci_conn *conn; struct hci_conn *conn;
struct sk_buff *skb; struct sk_buff *skb;
...@@ -2598,7 +2599,7 @@ static inline void hci_sched_sco(struct hci_dev *hdev) ...@@ -2598,7 +2599,7 @@ static inline void hci_sched_sco(struct hci_dev *hdev)
} }
} }
static inline void hci_sched_esco(struct hci_dev *hdev) static void hci_sched_esco(struct hci_dev *hdev)
{ {
struct hci_conn *conn; struct hci_conn *conn;
struct sk_buff *skb; struct sk_buff *skb;
...@@ -2621,7 +2622,7 @@ static inline void hci_sched_esco(struct hci_dev *hdev) ...@@ -2621,7 +2622,7 @@ static inline void hci_sched_esco(struct hci_dev *hdev)
} }
} }
static inline void hci_sched_le(struct hci_dev *hdev) static void hci_sched_le(struct hci_dev *hdev)
{ {
struct hci_chan *chan; struct hci_chan *chan;
struct sk_buff *skb; struct sk_buff *skb;
...@@ -2698,7 +2699,7 @@ static void hci_tx_work(struct work_struct *work) ...@@ -2698,7 +2699,7 @@ static void hci_tx_work(struct work_struct *work)
/* ----- HCI RX task (incoming data processing) ----- */ /* ----- HCI RX task (incoming data processing) ----- */
/* ACL data packet */ /* ACL data packet */
static inline void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb) static void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb)
{ {
struct hci_acl_hdr *hdr = (void *) skb->data; struct hci_acl_hdr *hdr = (void *) skb->data;
struct hci_conn *conn; struct hci_conn *conn;
...@@ -2742,7 +2743,7 @@ static inline void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb) ...@@ -2742,7 +2743,7 @@ static inline void hci_acldata_packet(struct hci_dev *hdev, struct sk_buff *skb)
} }
/* SCO data packet */ /* SCO data packet */
static inline void hci_scodata_packet(struct hci_dev *hdev, struct sk_buff *skb) static void hci_scodata_packet(struct hci_dev *hdev, struct sk_buff *skb)
{ {
struct hci_sco_hdr *hdr = (void *) skb->data; struct hci_sco_hdr *hdr = (void *) skb->data;
struct hci_conn *conn; struct hci_conn *conn;
......
net/bluetooth/hci_event.c
View file @ 6039aa73
This diff is collapsed.
net/bluetooth/hci_sock.c
View file @ 6039aa73
...@@ -496,7 +496,8 @@ static int hci_sock_blacklist_del(struct hci_dev *hdev, void __user *arg) ...@@ -496,7 +496,8 @@ static int hci_sock_blacklist_del(struct hci_dev *hdev, void __user *arg)
} }
/* Ioctls that require bound socket */ /* Ioctls that require bound socket */
static inline int hci_sock_bound_ioctl(struct sock *sk, unsigned int cmd, unsigned long arg) static int hci_sock_bound_ioctl(struct sock *sk, unsigned int cmd,
unsigned long arg)
{ {
struct hci_dev *hdev = hci_pi(sk)->hdev; struct hci_dev *hdev = hci_pi(sk)->hdev;
...@@ -712,7 +713,8 @@ static int hci_sock_getname(struct socket *sock, struct sockaddr *addr, int *add ...@@ -712,7 +713,8 @@ static int hci_sock_getname(struct socket *sock, struct sockaddr *addr, int *add
return 0; return 0;
} }
static inline void hci_sock_cmsg(struct sock *sk, struct msghdr *msg, struct sk_buff *skb) static void hci_sock_cmsg(struct sock *sk, struct msghdr *msg,
struct sk_buff *skb)
{ {
__u32 mask = hci_pi(sk)->cmsg_mask; __u32 mask = hci_pi(sk)->cmsg_mask;
......
net/bluetooth/hidp/core.c
View file @ 6039aa73
...@@ -268,7 +268,7 @@ static int __hidp_send_ctrl_message(struct hidp_session *session, ...@@ -268,7 +268,7 @@ static int __hidp_send_ctrl_message(struct hidp_session *session,
return 0; return 0;
} }
static inline int hidp_send_ctrl_message(struct hidp_session *session, static int hidp_send_ctrl_message(struct hidp_session *session,
unsigned char hdr, unsigned char *data, int size) unsigned char hdr, unsigned char *data, int size)
{ {
int err; int err;
...@@ -471,7 +471,7 @@ static void hidp_set_timer(struct hidp_session *session) ...@@ -471,7 +471,7 @@ static void hidp_set_timer(struct hidp_session *session)
mod_timer(&session->timer, jiffies + HZ * session->idle_to); mod_timer(&session->timer, jiffies + HZ * session->idle_to);
} }
static inline void hidp_del_timer(struct hidp_session *session) static void hidp_del_timer(struct hidp_session *session)
{ {
if (session->idle_to > 0) if (session->idle_to > 0)
del_timer(&session->timer); del_timer(&session->timer);
......
net/bluetooth/mgmt.c
View file @ 6039aa73
...@@ -1821,7 +1821,7 @@ static int set_io_capability(struct sock *sk, struct hci_dev *hdev, void *data, ...@@ -1821,7 +1821,7 @@ static int set_io_capability(struct sock *sk, struct hci_dev *hdev, void *data,
0); 0);
} }
static inline struct pending_cmd *find_pairing(struct hci_conn *conn) static struct pending_cmd *find_pairing(struct hci_conn *conn)
{ {
struct hci_dev *hdev = conn->hdev; struct hci_dev *hdev = conn->hdev;
struct pending_cmd *cmd; struct pending_cmd *cmd;
......
net/bluetooth/rfcomm/core.c
View file @ 6039aa73
...@@ -115,14 +115,14 @@ static void rfcomm_session_del(struct rfcomm_session *s); ...@@ -115,14 +115,14 @@ static void rfcomm_session_del(struct rfcomm_session *s);
#define __get_rpn_stop_bits(line) (((line) >> 2) & 0x1) #define __get_rpn_stop_bits(line) (((line) >> 2) & 0x1)
#define __get_rpn_parity(line) (((line) >> 3) & 0x7) #define __get_rpn_parity(line) (((line) >> 3) & 0x7)
static inline void rfcomm_schedule(void) static void rfcomm_schedule(void)
{ {
if (!rfcomm_thread) if (!rfcomm_thread)
return; return;
wake_up_process(rfcomm_thread); wake_up_process(rfcomm_thread);
} }
static inline void rfcomm_session_put(struct rfcomm_session *s) static void rfcomm_session_put(struct rfcomm_session *s)
{ {
if (atomic_dec_and_test(&s->refcnt)) if (atomic_dec_and_test(&s->refcnt))
rfcomm_session_del(s); rfcomm_session_del(s);
...@@ -227,7 +227,7 @@ static int rfcomm_l2sock_create(struct socket **sock) ...@@ -227,7 +227,7 @@ static int rfcomm_l2sock_create(struct socket **sock)
return err; return err;
} }
static inline int rfcomm_check_security(struct rfcomm_dlc *d) static int rfcomm_check_security(struct rfcomm_dlc *d)
{ {
struct sock *sk = d->session->sock->sk; struct sock *sk = d->session->sock->sk;
struct l2cap_conn *conn = l2cap_pi(sk)->chan->conn; struct l2cap_conn *conn = l2cap_pi(sk)->chan->conn;
...@@ -1750,7 +1750,7 @@ static void rfcomm_process_connect(struct rfcomm_session *s) ...@@ -1750,7 +1750,7 @@ static void rfcomm_process_connect(struct rfcomm_session *s)
/* Send data queued for the DLC. /* Send data queued for the DLC.
* Return number of frames left in the queue. * Return number of frames left in the queue.
*/ */
static inline int rfcomm_process_tx(struct rfcomm_dlc *d) static int rfcomm_process_tx(struct rfcomm_dlc *d)
{ {
struct sk_buff *skb; struct sk_buff *skb;
int err; int err;
...@@ -1798,7 +1798,7 @@ static inline int rfcomm_process_tx(struct rfcomm_dlc *d) ...@@ -1798,7 +1798,7 @@ static inline int rfcomm_process_tx(struct rfcomm_dlc *d)
return skb_queue_len(&d->tx_queue); return skb_queue_len(&d->tx_queue);
} }
static inline void rfcomm_process_dlcs(struct rfcomm_session *s) static void rfcomm_process_dlcs(struct rfcomm_session *s)
{ {
struct rfcomm_dlc *d; struct rfcomm_dlc *d;
struct list_head *p, *n; struct list_head *p, *n;
...@@ -1858,7 +1858,7 @@ static inline void rfcomm_process_dlcs(struct rfcomm_session *s) ...@@ -1858,7 +1858,7 @@ static inline void rfcomm_process_dlcs(struct rfcomm_session *s)
} }
} }
static inline void rfcomm_process_rx(struct rfcomm_session *s) static void rfcomm_process_rx(struct rfcomm_session *s)
{ {
struct socket *sock = s->sock; struct socket *sock = s->sock;
struct sock *sk = sock->sk; struct sock *sk = sock->sk;
...@@ -1883,7 +1883,7 @@ static inline void rfcomm_process_rx(struct rfcomm_session *s) ...@@ -1883,7 +1883,7 @@ static inline void rfcomm_process_rx(struct rfcomm_session *s)
} }
} }
static inline void rfcomm_accept_connection(struct rfcomm_session *s) static void rfcomm_accept_connection(struct rfcomm_session *s)
{ {
struct socket *sock = s->sock, *nsock; struct socket *sock = s->sock, *nsock;
int err; int err;
...@@ -1917,7 +1917,7 @@ static inline void rfcomm_accept_connection(struct rfcomm_session *s) ...@@ -1917,7 +1917,7 @@ static inline void rfcomm_accept_connection(struct rfcomm_session *s)
sock_release(nsock); sock_release(nsock);
} }
static inline void rfcomm_check_connection(struct rfcomm_session *s) static void rfcomm_check_connection(struct rfcomm_session *s)
{ {
struct sock *sk = s->sock->sk; struct sock *sk = s->sock->sk;
...@@ -1941,7 +1941,7 @@ static inline void rfcomm_check_connection(struct rfcomm_session *s) ...@@ -1941,7 +1941,7 @@ static inline void rfcomm_check_connection(struct rfcomm_session *s)
} }
} }
static inline void rfcomm_process_sessions(void) static void rfcomm_process_sessions(void)
{ {
struct list_head *p, *n; struct list_head *p, *n;
......
net/bluetooth/rfcomm/tty.c
View file @ 6039aa73
...@@ -132,7 +132,7 @@ static struct rfcomm_dev *__rfcomm_dev_get(int id) ...@@ -132,7 +132,7 @@ static struct rfcomm_dev *__rfcomm_dev_get(int id)
return NULL; return NULL;
} }
static inline struct rfcomm_dev *rfcomm_dev_get(int id) static struct rfcomm_dev *rfcomm_dev_get(int id)
{ {
struct rfcomm_dev *dev; struct rfcomm_dev *dev;
...@@ -345,7 +345,7 @@ static void rfcomm_wfree(struct sk_buff *skb) ...@@ -345,7 +345,7 @@ static void rfcomm_wfree(struct sk_buff *skb)
tty_port_put(&dev->port); tty_port_put(&dev->port);
} }
static inline void rfcomm_set_owner_w(struct sk_buff *skb, struct rfcomm_dev *dev) static void rfcomm_set_owner_w(struct sk_buff *skb, struct rfcomm_dev *dev)
{ {
tty_port_get(&dev->port); tty_port_get(&dev->port);
atomic_add(skb->truesize, &dev->wmem_alloc); atomic_add(skb->truesize, &dev->wmem_alloc);
......
net/bluetooth/sco.c
View file @ 6039aa73
...@@ -123,7 +123,7 @@ static struct sco_conn *sco_conn_add(struct hci_conn *hcon) ...@@ -123,7 +123,7 @@ static struct sco_conn *sco_conn_add(struct hci_conn *hcon)
return conn; return conn;
} }
static inline struct sock *sco_chan_get(struct sco_conn *conn) static struct sock *sco_chan_get(struct sco_conn *conn)
{ {
struct sock *sk = NULL; struct sock *sk = NULL;
sco_conn_lock(conn); sco_conn_lock(conn);
...@@ -157,7 +157,8 @@ static int sco_conn_del(struct hci_conn *hcon, int err) ...@@ -157,7 +157,8 @@ static int sco_conn_del(struct hci_conn *hcon, int err)
return 0; return 0;
} }
static inline int sco_chan_add(struct sco_conn *conn, struct sock *sk, struct sock *parent) static int sco_chan_add(struct sco_conn *conn, struct sock *sk,
struct sock *parent)
{ {
int err = 0; int err = 0;
...@@ -228,7 +229,7 @@ static int sco_connect(struct sock *sk) ...@@ -228,7 +229,7 @@ static int sco_connect(struct sock *sk)
return err; return err;
} }
static inline int sco_send_frame(struct sock *sk, struct msghdr *msg, int len) static int sco_send_frame(struct sock *sk, struct msghdr *msg, int len)
{ {
struct sco_conn *conn = sco_pi(sk)->conn; struct sco_conn *conn = sco_pi(sk)->conn;
struct sk_buff *skb; struct sk_buff *skb;
...@@ -254,7 +255,7 @@ static inline int sco_send_frame(struct sock *sk, struct msghdr *msg, int len) ...@@ -254,7 +255,7 @@ static inline int sco_send_frame(struct sock *sk, struct msghdr *msg, int len)
return len; return len;
} }
static inline void sco_recv_frame(struct sco_conn *conn, struct sk_buff *skb) static void sco_recv_frame(struct sco_conn *conn, struct sk_buff *skb)
{ {
struct sock *sk = sco_chan_get(conn); struct sock *sk = sco_chan_get(conn);
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7