From c74e543747bd2b4b3890f159c0ac8d3360eb8e3b Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Sat, 6 Apr 2013 20:28:51 +0200 Subject: [PATCH] --- yaml --- r: 369551 b: refs/heads/master c: af87b3d0151e39f23e795d327e25019be687d8c0 h: refs/heads/master i: 369549: 7525135f9279b97570a496f93977e2636ce71afa 369547: 42453ad13986e7d9c14d4e9dc362d9a3414c238b 369543: 7b133131f3ffa3cf5f4d814805da262de0e98cf0 369535: c1ad7d9b2787167964c6f888cb5aeb83ee791c02 v: v3 --- [refs] | 2 +- trunk/net/bluetooth/hidp/core.c | 24 +++++------------------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/[refs] b/[refs] index 6ccfe738d414..9cf8cd794c21 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 41edc0c034160408feaa78c9a50cc5e91a5928c7 +refs/heads/master: af87b3d0151e39f23e795d327e25019be687d8c0 diff --git a/trunk/net/bluetooth/hidp/core.c b/trunk/net/bluetooth/hidp/core.c index 5fcc0389d929..13a0a0590947 100644 --- a/trunk/net/bluetooth/hidp/core.c +++ b/trunk/net/bluetooth/hidp/core.c @@ -143,13 +143,15 @@ static int hidp_send_intr_message(struct hidp_session *session, &session->intr_transmit, hdr, data, size); } -static int hidp_queue_event(struct hidp_session *session, struct input_dev *dev, - unsigned int type, unsigned int code, int value) +static int hidp_input_event(struct input_dev *dev, unsigned int type, + unsigned int code, int value) { + struct hidp_session *session = input_get_drvdata(dev); unsigned char newleds; unsigned char hdr, data[2]; - BT_DBG("session %p type %d code %d value %d", session, type, code, value); + BT_DBG("session %p type %d code %d value %d", + session, type, code, value); if (type != EV_LED) return -1; @@ -172,21 +174,6 @@ static int hidp_queue_event(struct hidp_session *session, struct input_dev *dev, return hidp_send_intr_message(session, hdr, data, 2); } -static int hidp_hidinput_event(struct input_dev *dev, unsigned int type, unsigned int code, int value) -{ - struct hid_device *hid = input_get_drvdata(dev); - struct hidp_session *session = hid->driver_data; - - return hidp_queue_event(session, dev, type, code, value); -} - -static int hidp_input_event(struct input_dev *dev, unsigned int type, unsigned int code, int value) -{ - struct hidp_session *session = input_get_drvdata(dev); - - return hidp_queue_event(session, dev, type, code, value); -} - static void hidp_input_report(struct hidp_session *session, struct sk_buff *skb) { struct input_dev *dev = session->input; @@ -732,7 +719,6 @@ static struct hid_ll_driver hidp_hid_driver = { .stop = hidp_stop, .open = hidp_open, .close = hidp_close, - .hidinput_input_event = hidp_hidinput_event, }; /* This function sets up the hid device. It does not add it