diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2018-09-17 23:31:36 +0200 |
---|---|---|
committer | Johannes Berg <johannes.berg@intel.com> | 2018-09-19 11:04:33 +0200 |
commit | ab3fd3b9a801a9faa2619e2e65207e736f859a6d (patch) | |
tree | f0a6425fe00ba440e966570e662e6ff9c738d230 /patches/0053-remove_wait_on_bit_timeout/btusb.patch | |
parent | 30a378636e473278ff65800b1fe58822e36d716c (diff) |
backports: Remove unused parts
This removes parts which were only used by subsystems which are not
included in backports any more, for example media, bluetooth and
Ethernet.
The patches which are removed in this commit are not applied to the
kernel tree anyway with the default configuration because non of the
files get copied. The freezer, media, regulator and sound parts were
only used by the already removed media drivers. The flow dissector file
is not copied any more.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'patches/0053-remove_wait_on_bit_timeout/btusb.patch')
-rw-r--r-- | patches/0053-remove_wait_on_bit_timeout/btusb.patch | 110 |
1 files changed, 0 insertions, 110 deletions
diff --git a/patches/0053-remove_wait_on_bit_timeout/btusb.patch b/patches/0053-remove_wait_on_bit_timeout/btusb.patch deleted file mode 100644 index 52ed8b12..00000000 --- a/patches/0053-remove_wait_on_bit_timeout/btusb.patch +++ /dev/null @@ -1,110 +0,0 @@ ---- a/drivers/bluetooth/btusb.c -+++ b/drivers/bluetooth/btusb.c -@@ -1845,8 +1845,12 @@ static void btusb_intel_bootup(struct bt - return; - - if (test_and_clear_bit(BTUSB_BOOTING, &data->flags)) { -+#if LINUX_VERSION_IS_GEQ(3,17,0) - smp_mb__after_atomic(); - wake_up_bit(&data->flags, BTUSB_BOOTING); -+#else -+ wake_up_interruptible(&data->hdev->req_wait_q); -+#endif - } - } - -@@ -1863,8 +1867,12 @@ static void btusb_intel_secure_send_resu - - if (test_and_clear_bit(BTUSB_DOWNLOADING, &data->flags) && - test_bit(BTUSB_FIRMWARE_LOADED, &data->flags)) { -+#if LINUX_VERSION_IS_GEQ(3,17,0) - smp_mb__after_atomic(); - wake_up_bit(&data->flags, BTUSB_DOWNLOADING); -+#else -+ wake_up_interruptible(&data->hdev->req_wait_q); -+#endif - } - } - -@@ -2208,6 +2216,7 @@ static int btusb_setup_intel_new(struct - * and thus just timeout if that happens and fail the setup - * of this device. - */ -+#if LINUX_VERSION_IS_GEQ(3,17,0) - err = wait_on_bit_timeout(&data->flags, BTUSB_DOWNLOADING, - TASK_INTERRUPTIBLE, - msecs_to_jiffies(5000)); -@@ -2222,6 +2231,31 @@ static int btusb_setup_intel_new(struct - err = -ETIMEDOUT; - goto done; - } -+#else -+ if (test_bit(BTUSB_DOWNLOADING, &data->flags)) { -+ DECLARE_WAITQUEUE(wait, current); -+ signed long timeout; -+ -+ add_wait_queue(&hdev->req_wait_q, &wait); -+ set_current_state(TASK_INTERRUPTIBLE); -+ -+ timeout = schedule_timeout(msecs_to_jiffies(5000)); -+ -+ remove_wait_queue(&hdev->req_wait_q, &wait); -+ -+ if (signal_pending(current)) { -+ BT_ERR("%s: Firmware loading interrupted", hdev->name); -+ err = -EINTR; -+ goto done; -+ } -+ -+ if (!timeout) { -+ BT_ERR("%s: Firmware loading timeout", hdev->name); -+ err = -ETIMEDOUT; -+ goto done; -+ } -+ } -+#endif - - if (test_bit(BTUSB_FIRMWARE_FAILED, &data->flags)) { - BT_ERR("%s: Firmware loading failed", hdev->name); -@@ -2261,6 +2295,7 @@ done: - */ - BT_INFO("%s: Waiting for device to boot", hdev->name); - -+#if LINUX_VERSION_IS_GEQ(3,17,0) - err = wait_on_bit_timeout(&data->flags, BTUSB_BOOTING, - TASK_INTERRUPTIBLE, - msecs_to_jiffies(1000)); -@@ -2274,6 +2309,33 @@ done: - BT_ERR("%s: Device boot timeout", hdev->name); - return -ETIMEDOUT; - } -+#else -+ if (test_bit(BTUSB_BOOTING, &data->flags)) { -+ DECLARE_WAITQUEUE(wait, current); -+ signed long timeout; -+ -+ add_wait_queue(&hdev->req_wait_q, &wait); -+ set_current_state(TASK_INTERRUPTIBLE); -+ -+ /* Booting into operational firmware should not take -+ * longer than 1 second. However if that happens, then -+ * just fail the setup since something went wrong. -+ */ -+ timeout = schedule_timeout(msecs_to_jiffies(1000)); -+ -+ remove_wait_queue(&hdev->req_wait_q, &wait); -+ -+ if (signal_pending(current)) { -+ BT_ERR("%s: Device boot interrupted", hdev->name); -+ return -EINTR; -+ } -+ -+ if (!timeout) { -+ BT_ERR("%s: Device boot timeout", hdev->name); -+ return -ETIMEDOUT; -+ } -+ } -+#endif - - rettime = ktime_get(); - delta = ktime_sub(rettime, calltime); |