xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ANDROID: Revert "thermal: Make thermal_zone_device_is_enabled() available to core only"

Browse Source 
thermal_zone_device_is_enabled may be needed by vendor drivers which
GKI require be loadable modules.

This reverts commit 514acd00f9.

Change-Id: I9c65766c4769fc12376b932d561d45e2f5662948
Signed-off-by: Giuliano Procida <gprocida@google.com>
(cherry picked from commit d0095fb25f76c6b474bd96c5737e1bdc33ba2c6c)
Signed-off-by: Will McVicker <willmcvicker@google.com>
(cherry picked from commit 8c0a37fe4521a2ce2116d2efa76fb524a450a9b3)
Signed-off-by: Will McVicker <willmcvicker@google.com>
This commit is contained in:
Giuliano Procida
2020-10-02 15:12:08 +01:00
committed by Greg Kroah-Hartman
parent 3300dadf1c
commit baead118d8
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/thermal/thermal_core.c
View File

@@ -541,6 +541,7 @@ int thermal_zone_device_is_enabled(struct thermal_zone_device *tz)
return mode == THERMAL_DEVICE_ENABLED; return mode == THERMAL_DEVICE_ENABLED;
} }
EXPORT_SYMBOL_GPL(thermal_zone_device_is_enabled);
void thermal_zone_device_update(struct thermal_zone_device *tz, void thermal_zone_device_update(struct thermal_zone_device *tz,
enum thermal_notify_event event) enum thermal_notify_event event)

2
drivers/thermal/thermal_core.h
View File

@@ -179,6 +179,4 @@ of_thermal_get_trip_points(struct thermal_zone_device *tz)
} }
#endif #endif
int thermal_zone_device_is_enabled(struct thermal_zone_device *tz);
#endif /* __THERMAL_CORE_H__ */ #endif /* __THERMAL_CORE_H__ */

5
include/linux/thermal.h
View File

@@ -399,6 +399,7 @@ void thermal_cdev_update(struct thermal_cooling_device *);
void thermal_notify_framework(struct thermal_zone_device *, int); void thermal_notify_framework(struct thermal_zone_device *, int);
int thermal_zone_device_enable(struct thermal_zone_device *tz); int thermal_zone_device_enable(struct thermal_zone_device *tz);
int thermal_zone_device_disable(struct thermal_zone_device *tz); int thermal_zone_device_disable(struct thermal_zone_device *tz);
int thermal_zone_device_is_enabled(struct thermal_zone_device *tz);
#else #else
static inline struct thermal_zone_device *thermal_zone_device_register( static inline struct thermal_zone_device *thermal_zone_device_register(
const char *type, int trips, int mask, void *devdata, const char *type, int trips, int mask, void *devdata,
@@ -452,6 +453,10 @@ static inline int thermal_zone_device_enable(struct thermal_zone_device *tz)
static inline int thermal_zone_device_disable(struct thermal_zone_device *tz) static inline int thermal_zone_device_disable(struct thermal_zone_device *tz)
{ return -ENODEV; } { return -ENODEV; }
static inline int
thermal_zone_device_is_enabled(struct thermal_zone_device *tz)
{ return -ENODEV; }
#endif /* CONFIG_THERMAL */ #endif /* CONFIG_THERMAL */
#endif /* __THERMAL_H__ */ #endif /* __THERMAL_H__ */