From 22dbfbf81dd30bd5041943679fc6f3efa3234ba6 Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sat, 31 May 2014 17:21:40 +0200 Subject: [PATCH] backports: remove unused functions from bluetooth hidp_set_raw_report() and hidp_output_report() are not used with kernel < 3.15. Signed-off-by: Hauke Mehrtens --- .../net_bluetooth_hidp_core.patch | 20 ++----------------- 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/patches/collateral-evolutions/network/0029-struct_hid_ll_driver-extensions/net_bluetooth_hidp_core.patch b/patches/collateral-evolutions/network/0029-struct_hid_ll_driver-extensions/net_bluetooth_hidp_core.patch index 4d452bd9f66d..af487b3b8a46 100644 --- a/patches/collateral-evolutions/network/0029-struct_hid_ll_driver-extensions/net_bluetooth_hidp_core.patch +++ b/patches/collateral-evolutions/network/0029-struct_hid_ll_driver-extensions/net_bluetooth_hidp_core.patch @@ -8,23 +8,7 @@ static int hidp_get_raw_report(struct hid_device *hid, unsigned char report_number, unsigned char *data, size_t count, -@@ -307,6 +308,7 @@ err: - mutex_unlock(&session->report_mutex); - return ret; - } -+#endif - - static int hidp_set_raw_report(struct hid_device *hid, unsigned char reportnum, - unsigned char *data, size_t count, -@@ -382,6 +384,7 @@ static int hidp_output_report(struct hid - data, count); - } - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0) - static int hidp_raw_request(struct hid_device *hid, unsigned char reportnum, - __u8 *buf, size_t len, unsigned char rtype, - int reqtype) -@@ -395,6 +398,7 @@ static int hidp_raw_request(struct hid_d +@@ -395,6 +396,7 @@ static int hidp_raw_request(struct hid_d return -EIO; } } @@ -32,7 +16,7 @@ static void hidp_idle_timeout(unsigned long arg) { -@@ -724,8 +728,10 @@ static struct hid_ll_driver hidp_hid_dri +@@ -724,8 +726,10 @@ static struct hid_ll_driver hidp_hid_dri .stop = hidp_stop, .open = hidp_open, .close = hidp_close, -- 2.30.2