shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-06 19:08:57 +09:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
This reverts commit baead118d8 as there
should not be any need for this by any drivers as upstream has moved on
from using this entirely, so no out-of-tree drivers should be using it
either.

Cc: Giuliano Procida <gprocida@google.com>
Cc: Will McVicker <willmcvicker@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ifbfe33b442eb3d64466713cd5cd303b2257ab8b9
This commit is contained in:
Greg Kroah-Hartman
2020-12-18 15:23:06 +01:00
parent 8b882de4c1
commit ad39a2c85d
3 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/thermal/thermal_core.c
View File

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

2
drivers/thermal/thermal_core.h
View File

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

5
include/linux/thermal.h
View File

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