aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth
diff options
context:
space:
mode:
authorDavid Herrmann <dh.herrmann@gmail.com>2013-04-06 14:28:43 -0400
committerGustavo Padovan <gustavo.padovan@collabora.co.uk>2013-04-17 01:56:59 -0400
commit3764eaa922c78037ad9bed06be5c8b8a5c83b37d (patch)
tree71f7d91e8344af5e6efadd676180191a00c36c2b /net/bluetooth
parentf53c20e93612f708ed3b378ec9735b779dcd7d59 (diff)
Bluetooth: hidp: move hidp_schedule() to core.c
There is no reason to keep this helper in the header file. No other file depends on it so move it into hidp/core.c where it belongs. Signed-off-by: David Herrmann <dh.herrmann@gmail.com> Acked-by: Marcel Holtmann <marcel@holtmann.org> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Diffstat (limited to 'net/bluetooth')
-rw-r--r--net/bluetooth/hidp/core.c9
-rw-r--r--net/bluetooth/hidp/hidp.h9
2 files changed, 9 insertions, 9 deletions
diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index e01a9246c14d..cef1021d5403 100644
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -59,6 +59,15 @@ static unsigned char hidp_keycode[256] = {
59 59
60static unsigned char hidp_mkeyspat[] = { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 }; 60static unsigned char hidp_mkeyspat[] = { 0x01, 0x01, 0x01, 0x01, 0x01, 0x01 };
61 61
62static inline void hidp_schedule(struct hidp_session *session)
63{
64 struct sock *ctrl_sk = session->ctrl_sock->sk;
65 struct sock *intr_sk = session->intr_sock->sk;
66
67 wake_up_interruptible(sk_sleep(ctrl_sk));
68 wake_up_interruptible(sk_sleep(intr_sk));
69}
70
62static struct hidp_session *__hidp_get_session(bdaddr_t *bdaddr) 71static struct hidp_session *__hidp_get_session(bdaddr_t *bdaddr)
63{ 72{
64 struct hidp_session *session; 73 struct hidp_session *session;
diff --git a/net/bluetooth/hidp/hidp.h b/net/bluetooth/hidp/hidp.h
index 57a6191674fd..c84442061793 100644
--- a/net/bluetooth/hidp/hidp.h
+++ b/net/bluetooth/hidp/hidp.h
@@ -174,15 +174,6 @@ struct hidp_session {
174 int waiting_for_startup; 174 int waiting_for_startup;
175}; 175};
176 176
177static inline void hidp_schedule(struct hidp_session *session)
178{
179 struct sock *ctrl_sk = session->ctrl_sock->sk;
180 struct sock *intr_sk = session->intr_sock->sk;
181
182 wake_up_interruptible(sk_sleep(ctrl_sk));
183 wake_up_interruptible(sk_sleep(intr_sk));
184}
185
186/* HIDP init defines */ 177/* HIDP init defines */
187extern int __init hidp_init_sockets(void); 178extern int __init hidp_init_sockets(void);
188extern void __exit hidp_cleanup_sockets(void); 179extern void __exit hidp_cleanup_sockets(void);