aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Morton <akpm@linux-foundation.org>2008-02-05 06:07:58 -0500
committerDavid S. Miller <davem@davemloft.net>2008-02-05 06:07:58 -0500
commit91f5cca3d1b4341624715f6dd01ee09be9af46c4 (patch)
tree19e12d37244cbe39203586da26ef055b92abef49
parenteff001e35a857361f3fb289fea86e97c334a5446 (diff)
bluetooth: uninlining
Remove all those inlines which were either a) unneeded or b) increased code size. text data bss dec hex filename before: 6997 74 8 7079 1ba7 net/bluetooth/hidp/core.o after: 6492 74 8 6574 19ae net/bluetooth/hidp/core.o Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/bluetooth/hidp/core.c30
1 files changed, 19 insertions, 11 deletions
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index b5c40d60cdf3..519cdb920f93 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -135,8 +135,8 @@ static void __hidp_copy_session(struct hidp_session *session, struct hidp_connin
135 } 135 }
136} 136}
137 137
138static inline int hidp_queue_event(struct hidp_session *session, struct input_dev *dev, 138static int hidp_queue_event(struct hidp_session *session, struct input_dev *dev,
139 unsigned int type, unsigned int code, int value) 139 unsigned int type, unsigned int code, int value)
140{ 140{
141 unsigned char newleds; 141 unsigned char newleds;
142 struct sk_buff *skb; 142 struct sk_buff *skb;
@@ -243,7 +243,8 @@ static void hidp_input_report(struct hidp_session *session, struct sk_buff *skb)
243 input_sync(dev); 243 input_sync(dev);
244} 244}
245 245
246static inline int hidp_queue_report(struct hidp_session *session, unsigned char *data, int size) 246static int hidp_queue_report(struct hidp_session *session,
247 unsigned char *data, int size)
247{ 248{
248 struct sk_buff *skb; 249 struct sk_buff *skb;
249 250
@@ -287,7 +288,7 @@ static void hidp_idle_timeout(unsigned long arg)
287 hidp_schedule(session); 288 hidp_schedule(session);
288} 289}
289 290
290static inline void hidp_set_timer(struct hidp_session *session) 291static void hidp_set_timer(struct hidp_session *session)
291{ 292{
292 if (session->idle_to > 0) 293 if (session->idle_to > 0)
293 mod_timer(&session->timer, jiffies + HZ * session->idle_to); 294 mod_timer(&session->timer, jiffies + HZ * session->idle_to);
@@ -332,7 +333,8 @@ static inline int hidp_send_ctrl_message(struct hidp_session *session,
332 return err; 333 return err;
333} 334}
334 335
335static inline void hidp_process_handshake(struct hidp_session *session, unsigned char param) 336static void hidp_process_handshake(struct hidp_session *session,
337 unsigned char param)
336{ 338{
337 BT_DBG("session %p param 0x%02x", session, param); 339 BT_DBG("session %p param 0x%02x", session, param);
338 340
@@ -365,7 +367,8 @@ static inline void hidp_process_handshake(struct hidp_session *session, unsigned
365 } 367 }
366} 368}
367 369
368static inline void hidp_process_hid_control(struct hidp_session *session, unsigned char param) 370static void hidp_process_hid_control(struct hidp_session *session,
371 unsigned char param)
369{ 372{
370 BT_DBG("session %p param 0x%02x", session, param); 373 BT_DBG("session %p param 0x%02x", session, param);
371 374
@@ -379,7 +382,8 @@ static inline void hidp_process_hid_control(struct hidp_session *session, unsign
379 } 382 }
380} 383}
381 384
382static inline void hidp_process_data(struct hidp_session *session, struct sk_buff *skb, unsigned char param) 385static void hidp_process_data(struct hidp_session *session, struct sk_buff *skb,
386 unsigned char param)
383{ 387{
384 BT_DBG("session %p skb %p len %d param 0x%02x", session, skb, skb->len, param); 388 BT_DBG("session %p skb %p len %d param 0x%02x", session, skb, skb->len, param);
385 389
@@ -406,7 +410,8 @@ static inline void hidp_process_data(struct hidp_session *session, struct sk_buf
406 } 410 }
407} 411}
408 412
409static inline void hidp_recv_ctrl_frame(struct hidp_session *session, struct sk_buff *skb) 413static void hidp_recv_ctrl_frame(struct hidp_session *session,
414 struct sk_buff *skb)
410{ 415{
411 unsigned char hdr, type, param; 416 unsigned char hdr, type, param;
412 417
@@ -440,7 +445,8 @@ static inline void hidp_recv_ctrl_frame(struct hidp_session *session, struct sk_
440 kfree_skb(skb); 445 kfree_skb(skb);
441} 446}
442 447
443static inline void hidp_recv_intr_frame(struct hidp_session *session, struct sk_buff *skb) 448static void hidp_recv_intr_frame(struct hidp_session *session,
449 struct sk_buff *skb)
444{ 450{
445 unsigned char hdr; 451 unsigned char hdr;
446 452
@@ -608,7 +614,8 @@ static struct device *hidp_get_device(struct hidp_session *session)
608 return conn ? &conn->dev : NULL; 614 return conn ? &conn->dev : NULL;
609} 615}
610 616
611static inline int hidp_setup_input(struct hidp_session *session, struct hidp_connadd_req *req) 617static int hidp_setup_input(struct hidp_session *session,
618 struct hidp_connadd_req *req)
612{ 619{
613 struct input_dev *input = session->input; 620 struct input_dev *input = session->input;
614 int i; 621 int i;
@@ -685,7 +692,8 @@ static void hidp_setup_quirks(struct hid_device *hid)
685 hid->quirks = hidp_blacklist[n].quirks; 692 hid->quirks = hidp_blacklist[n].quirks;
686} 693}
687 694
688static inline void hidp_setup_hid(struct hidp_session *session, struct hidp_connadd_req *req) 695static void hidp_setup_hid(struct hidp_session *session,
696 struct hidp_connadd_req *req)
689{ 697{
690 struct hid_device *hid = session->hid; 698 struct hid_device *hid = session->hid;
691 struct hid_report *report; 699 struct hid_report *report;