diff options
| author | Zhang Rui <rui.zhang@intel.com> | 2016-03-15 07:53:01 +0800 |
|---|---|---|
| committer | Zhang Rui <rui.zhang@intel.com> | 2016-03-15 07:53:01 +0800 |
| commit | 032f4a1e5a307c63b5ac27298ea82eb328f40ccc (patch) | |
| tree | 3ba2d301d6408c6d3b11439076464f25c24b8cd5 /include | |
| parent | ccb361d2fdda8975c8bbc8a1749c31dbd62dd276 (diff) | |
| parent | 61f846f37354fd294f3172845d9fec2c03f60a45 (diff) | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal into thermal-soc
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/thermal.h | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/include/linux/thermal.h b/include/linux/thermal.h index e13a1ace50e9..9c481991fdc7 100644 --- a/include/linux/thermal.h +++ b/include/linux/thermal.h @@ -362,6 +362,11 @@ thermal_zone_of_sensor_register(struct device *dev, int id, void *data, const struct thermal_zone_of_device_ops *ops); void thermal_zone_of_sensor_unregister(struct device *dev, struct thermal_zone_device *tz); +struct thermal_zone_device *devm_thermal_zone_of_sensor_register( + struct device *dev, int id, void *data, + const struct thermal_zone_of_device_ops *ops); +void devm_thermal_zone_of_sensor_unregister(struct device *dev, + struct thermal_zone_device *tz); #else static inline struct thermal_zone_device * thermal_zone_of_sensor_register(struct device *dev, int id, void *data, @@ -376,6 +381,19 @@ void thermal_zone_of_sensor_unregister(struct device *dev, { } +static inline struct thermal_zone_device *devm_thermal_zone_of_sensor_register( + struct device *dev, int id, void *data, + const struct thermal_zone_of_device_ops *ops) +{ + return ERR_PTR(-ENODEV); +} + +static inline +void devm_thermal_zone_of_sensor_unregister(struct device *dev, + struct thermal_zone_device *tz) +{ +} + #endif #if IS_ENABLED(CONFIG_THERMAL) |