summaryrefslogtreecommitdiff
path: root/patches/0062-acpi-gpio-remove/hci_intel.patch
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2018-09-17 23:31:36 +0200
committerJohannes Berg <johannes.berg@intel.com>2018-09-19 11:04:33 +0200
commitab3fd3b9a801a9faa2619e2e65207e736f859a6d (patch)
treef0a6425fe00ba440e966570e662e6ff9c738d230 /patches/0062-acpi-gpio-remove/hci_intel.patch
parent30a378636e473278ff65800b1fe58822e36d716c (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/0062-acpi-gpio-remove/hci_intel.patch')
-rw-r--r--patches/0062-acpi-gpio-remove/hci_intel.patch67
1 files changed, 0 insertions, 67 deletions
diff --git a/patches/0062-acpi-gpio-remove/hci_intel.patch b/patches/0062-acpi-gpio-remove/hci_intel.patch
deleted file mode 100644
index 9237ce97..00000000
--- a/patches/0062-acpi-gpio-remove/hci_intel.patch
+++ /dev/null
@@ -1,67 +0,0 @@
---- a/drivers/bluetooth/hci_intel.c
-+++ b/drivers/bluetooth/hci_intel.c
-@@ -29,7 +29,9 @@
- #include <linux/wait.h>
- #include <linux/tty.h>
- #include <linux/platform_device.h>
-+#if LINUX_VERSION_IS_GEQ(3,13,0)
- #include <linux/gpio/consumer.h>
-+#endif
- #include <linux/acpi.h>
- #include <linux/interrupt.h>
- #include <linux/pm_runtime.h>
-@@ -379,7 +381,9 @@ static int intel_set_power(struct hci_ua
- BT_INFO("hu %p, Switching compatible pm device (%s) to %u",
- hu, dev_name(&idev->pdev->dev), powered);
-
-+#if LINUX_VERSION_IS_GEQ(3,13,0)
- gpiod_set_value(idev->reset, powered);
-+#endif
-
- /* Provide to idev a hu reference which is used to run LPM
- * transactions (lpm suspend/resume) from PM callbacks.
-@@ -1306,14 +1310,17 @@ static int intel_probe(struct platform_d
-
- idev->pdev = pdev;
-
-+#if LINUX_VERSION_IS_GEQ(3,17,0)
- idev->reset = devm_gpiod_get_optional(&pdev->dev, "reset",
- GPIOD_OUT_LOW);
- if (IS_ERR(idev->reset)) {
- dev_err(&pdev->dev, "Unable to retrieve gpio\n");
- return PTR_ERR(idev->reset);
- }
-+#endif
-
- idev->irq = platform_get_irq(pdev, 0);
-+#if LINUX_VERSION_IS_GEQ(3,17,0)
- if (idev->irq < 0) {
- struct gpio_desc *host_wake;
-
-@@ -1332,12 +1339,15 @@ static int intel_probe(struct platform_d
- goto no_irq;
- }
- }
-+#endif
-
- /* Only enable wake-up/irq when controller is powered */
- device_set_wakeup_capable(&pdev->dev, true);
- device_wakeup_disable(&pdev->dev);
-
-+#if LINUX_VERSION_IS_GEQ(3,17,0)
- no_irq:
-+#endif
- platform_set_drvdata(pdev, idev);
-
- /* Place this instance on the device list */
-@@ -1345,8 +1355,10 @@ no_irq:
- list_add_tail(&idev->list, &intel_device_list);
- mutex_unlock(&intel_device_list_lock);
-
-+#if LINUX_VERSION_IS_GEQ(3,13,0)
- dev_info(&pdev->dev, "registered, gpio(%d)/irq(%d).\n",
- desc_to_gpio(idev->reset), idev->irq);
-+#endif
-
- return 0;
- }