diff options
| author | Johannes Berg <johannes.berg@intel.com> | 2023-06-07 16:08:05 +0200 |
|---|---|---|
| committer | iwlwifi publisher <> | 2023-06-09 18:48:05 +0000 |
| commit | 9f63541e4d0b1d47df9079e4dbb8ed079e874e6c (patch) | |
| tree | 1ce52ca5079f9123f07bcbfa29df91468cd88d9b | |
| parent | 3ebbc1fd34dedcf08500407c8dd93f426b852729 (diff) | |
| download | backport-iwlwifi-9f63541e4d0b1d47df9079e4dbb8ed079e874e6c.tar.gz | |
backports: inline thermal_zone_device_priv() backport
Make this backport an inline (which is better anyway),
and also rename it because there seem to be some custom
kernels with it backported to 6.3-ish. The NULL version
when CONFIG_THERMAL isn't defined was already an inline
and renamed, so this also aligns the two.
type=cleanup
ticket=none
Change-Id: Id3fe5511da47e367f2a452f46dd144b403de0411
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Reviewed-on: https://gerritwcs.ir.intel.com/c/iwlwifi-stack-dev/+/59293
tested: iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
Tested-by: iil_jenkins <EC.GER.UNIX.IIL.JENKINS@INTEL.COM>
x-iwlwifi-stack-dev: 654cca9a6f9796cac70ace1dc35043da9269d5ba
| -rw-r--r-- | backport-include/linux/thermal.h | 6 | ||||
| -rw-r--r-- | compat/Makefile | 1 | ||||
| -rw-r--r-- | compat/backport-6.4.c | 10 | ||||
| -rw-r--r-- | versions | 2 |
4 files changed, 6 insertions, 13 deletions
diff --git a/backport-include/linux/thermal.h b/backport-include/linux/thermal.h index d73a7ccf39..b5b5376449 100644 --- a/backport-include/linux/thermal.h +++ b/backport-include/linux/thermal.h @@ -29,7 +29,11 @@ thermal_zone_device_register_with_trips(const char *type, #endif /* <6,0,0 */ #if LINUX_VERSION_IS_LESS(6,4,0) -void *thermal_zone_device_priv(struct thermal_zone_device *tzd); +#define thermal_zone_device_priv LINUX_BACKPORT(thermal_zone_device_priv) +static inline void *thermal_zone_device_priv(struct thermal_zone_device *tzd) +{ + return tzd->devdata; +} #endif /* < 6.4.0 */ #else /* CONFIG_THERMAL */ #if LINUX_VERSION_IS_LESS(5,9,0) diff --git a/compat/Makefile b/compat/Makefile index 7e0e61348f..02337fcc6e 100644 --- a/compat/Makefile +++ b/compat/Makefile @@ -24,7 +24,6 @@ compat-$(CPTCFG_KERNEL_5_11) += backport-5.11.o compat-$(CPTCFG_KERNEL_5_13) += backport-5.13.o compat-$(CPTCFG_KERNEL_5_15) += backport-5.15.o compat-$(CPTCFG_KERNEL_6_0) += backport-6.0.o -compat-$(CPTCFG_KERNEL_6_4) += backport-6.4.o compat-$(CPTCFG_KERNEL_6_5) += backport-6.5.o compat-$(CPTCFG_BPAUTO_BUILD_SYSTEM_DATA_VERIFICATION) += verification/verify.o diff --git a/compat/backport-6.4.c b/compat/backport-6.4.c deleted file mode 100644 index 9bed7ae67b..0000000000 --- a/compat/backport-6.4.c +++ /dev/null @@ -1,10 +0,0 @@ -// SPDX-License-Identifier: GPL-2.0 -#include <linux/thermal.h> - -#ifdef CONFIG_THERMAL -void *thermal_zone_device_priv(struct thermal_zone_device *tzd) -{ - return tzd->devdata; -} -EXPORT_SYMBOL_GPL(thermal_zone_device_priv); -#endif /* CONFIG_THERMAL */ @@ -2,4 +2,4 @@ BACKPORTS_VERSION="(see git)" BACKPORTED_KERNEL_VERSION="(see git)" BACKPORTED_KERNEL_NAME="iwlwifi" BACKPORTS_BUILD_TSTAMP=__DATE__ \" \" __TIME__ -BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11285:12b0eb7f" +BACKPORTS_GIT_TRACKED="iwlwifi-stack-public:master:11286:654cca9a" |