diff options
author | Gustavo Padovan <gustavo.padovan@collabora.co.uk> | 2012-05-23 03:04:18 -0400 |
---|---|---|
committer | Johan Hedberg <johan.hedberg@intel.com> | 2012-06-04 23:34:07 -0400 |
commit | 6039aa73a1323edc2d6d93a22505d4dc28f38e3f (patch) | |
tree | fd1e0de2e823a0fa53234685cd21bf0f5e4b1a4d /net/bluetooth/sco.c | |
parent | 4f42a8cd4905e69ba4dd694d9338aeee1bb7e9ab (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/sco.c')
-rw-r--r-- | net/bluetooth/sco.c | 9 |
1 files changed, 5 insertions, 4 deletions
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 | ||
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 | 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 | ||
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 | int err = 0; | 163 | int err = 0; |
163 | 164 | ||
@@ -228,7 +229,7 @@ done: | |||
228 | return err; | 229 | return err; |
229 | } | 230 | } |
230 | 231 | ||
231 | static inline int sco_send_frame(struct sock *sk, struct msghdr *msg, int len) | 232 | static 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 | ||
257 | static inline void sco_recv_frame(struct sco_conn *conn, struct sk_buff *skb) | 258 | static 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 | ||