Pull thermal soc updates from Eduardo Valentin: - thermal core has a new devm_* API for registering cooling devices. I took the entire series, that is why you see changes on drivers/hwmon in this pull (Guenter Roeck) - rockchip thermal driver gains support to PX30 SoC (Elaine Zhang) - the generic-adc thermal driver now considers the lookup table DT property as optional (Jean-Francois Dagenais) - Refactoring of tsens thermal driver (Amit Kucheria) - Cleanups on cpu cooling driver (Daniel Lezcano) - broadcom thermal driver dropped support to ACPI (Srinath Mannam) - tegra thermal driver gains support to OC hw throttle and GPU throtle (Wei Ni) - Fixes in several thermal drivers. * 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal: (59 commits) hwmon: (pwm-fan) Use devm_thermal_of_cooling_device_register hwmon: (npcm750-pwm-fan) Use devm_thermal_of_cooling_device_register hwmon: (mlxreg-fan) Use devm_thermal_of_cooling_device_register hwmon: (gpio-fan) Use devm_thermal_of_cooling_device_register hwmon: (aspeed-pwm-tacho) Use devm_thermal_of_cooling_device_register thermal: rcar_gen3_thermal: Fix to show correct trip points number thermal: rcar_thermal: update calculation formula for R-Car Gen3 SoCs thermal: cpu_cooling: Actually trace CPU load in thermal_power_cpu_get_power thermal: rockchip: Support the PX30 SoC in thermal driver dt-bindings: rockchip-thermal: Support the PX30 SoC compatible thermal: rockchip: fix up the tsadc pinctrl setting error thermal: broadcom: Remove ACPI support thermal: Fix build error of missing devm_ioremap_resource on UM thermal/drivers/cpu_cooling: Remove pointless field thermal/drivers/cpu_cooling: Add Software Package Data Exchange (SPDX) thermal/drivers/cpu_cooling: Fixup the header and copyright thermal/drivers/cpu_cooling: Remove pointless test in power2state() thermal: rcar_gen3_thermal: disable interrupt in .remove thermal: rcar_gen3_thermal: fix interrupt type thermal: Introduce devm_thermal_of_cooling_device_register ...
Showing the changes to include/linux (1 of 42 files). Show all
Unified · Split
| @@ -447,6 +447,11 @@ struct thermal_cooling_device *thermal_cooling_device_register(char *, void *, · 446 unmodified lines | ||
| 447 | 447 | struct thermal_cooling_device * |
| 448 | 448 | thermal_of_cooling_device_register(struct device_node *np, char *, void *, |
| 449 | 449 | const struct thermal_cooling_device_ops *); |
| 450 | +struct thermal_cooling_device * | |
| 451 | +devm_thermal_of_cooling_device_register(struct device *dev, | |
| 452 | + struct device_node *np, | |
| 453 | + char *type, void *devdata, | |
| 454 | + const struct thermal_cooling_device_ops *ops); | |
| 450 | 455 | void thermal_cooling_device_unregister(struct thermal_cooling_device *); |
| 451 | 456 | struct thermal_zone_device *thermal_zone_get_zone_by_name(const char *name); |
| 452 | 457 | int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp); |
| @@ -503,6 +508,14 @@ static inline struct thermal_cooling_device * · 50 unmodified lines | ||
| 503 | 508 | thermal_of_cooling_device_register(struct device_node *np, |
| 504 | 509 | char *type, void *devdata, const struct thermal_cooling_device_ops *ops) |
| 505 | 510 | { return ERR_PTR(-ENODEV); } |
| 511 | +static inline struct thermal_cooling_device * | |
| 512 | +devm_thermal_of_cooling_device_register(struct device *dev, | |
| 513 | + struct device_node *np, | |
| 514 | + char *type, void *devdata, | |
| 515 | + const struct thermal_cooling_device_ops *ops) | |
| 516 | +{ | |
| 517 | + return ERR_PTR(-ENODEV); | |
| 518 | +} | |
| 506 | 519 | static inline void thermal_cooling_device_unregister( |
| 507 | 520 | struct thermal_cooling_device *cdev) |
| 508 | 521 | { } |