summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Berg <johannes.berg@intel.com>2017-02-07 22:26:07 +0100
committerJohannes Berg <johannes.berg@intel.com>2017-02-07 22:26:07 +0100
commit0db97ef4891a2e24a4fd010ce2efaa0b33a5cf78 (patch)
treeb750c081857eaec51627a95a8d4b576d9c84b239
parentb26baa6fc7fd07c873c754606f24a73062f715cc (diff)
backports: remove thermal patch
We now have a proper backport for this but I forgot to remove the patch - do that now. Signed-off-by: Johannes Berg <johannes.berg@intel.com>
-rw-r--r--patches/0070-thermal/iwlwifi.patch56
1 files changed, 0 insertions, 56 deletions
diff --git a/patches/0070-thermal/iwlwifi.patch b/patches/0070-thermal/iwlwifi.patch
deleted file mode 100644
index 1b37844c..00000000
--- a/patches/0070-thermal/iwlwifi.patch
+++ /dev/null
@@ -1,56 +0,0 @@
---- a/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
-+++ b/drivers/net/wireless/intel/iwlwifi/mvm/tt.c
-@@ -637,7 +637,11 @@ send:
- }
-
- static int iwl_mvm_tzone_get_temp(struct thermal_zone_device *device,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0)
-+ unsigned long *temperature)
-+#else
- int *temperature)
-+#endif
- {
- struct iwl_mvm *mvm = (struct iwl_mvm *)device->devdata;
- int ret;
-@@ -662,7 +666,11 @@ out:
- }
-
- static int iwl_mvm_tzone_get_trip_temp(struct thermal_zone_device *device,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0)
-+ int trip, unsigned long *temp)
-+#else
- int trip, int *temp)
-+#endif
- {
- struct iwl_mvm *mvm = (struct iwl_mvm *)device->devdata;
-
-@@ -685,8 +693,13 @@ static int iwl_mvm_tzone_get_trip_type(s
- return 0;
- }
-
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
- static int iwl_mvm_tzone_set_trip_temp(struct thermal_zone_device *device,
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(4,3,0)
-+ int trip, unsigned long temp)
-+#else
- int trip, int temp)
-+#endif
- {
- struct iwl_mvm *mvm = (struct iwl_mvm *)device->devdata;
- struct iwl_mvm_thermal_device *tzone;
-@@ -739,12 +752,15 @@ out:
- mutex_unlock(&mvm->mutex);
- return ret;
- }
-+#endif /* >= 3.6 */
-
- static struct thermal_zone_device_ops tzone_ops = {
- .get_temp = iwl_mvm_tzone_get_temp,
- .get_trip_temp = iwl_mvm_tzone_get_trip_temp,
- .get_trip_type = iwl_mvm_tzone_get_trip_type,
-+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,6,0)
- .set_trip_temp = iwl_mvm_tzone_set_trip_temp,
-+#endif
- };
-
- /* make all trips writable */