From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 16 May 2019 23:16:18 +0000 (-0700)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
X-Git-Tag: v5.4-rc1~953
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2c45e7fbc962be1b03f2c2af817a76f5ba810af2;p=platform%2Fkernel%2Flinux-rpi.git

Merge branch 'next' of git://git./linux/kernel/git/rzhang/linux

Pull thermal management updates from Zhang Rui:

 - Remove the 'module' Kconfig option for thermal subsystem framework
   because the thermal framework are required to be ready as early as
   possible to avoid overheat at boot time (Daniel Lezcano)

 - Fix a bug that thermal framework pokes disabled thermal zones upon
   resume (Wei Wang)

  - A couple of cleanups and trivial fixes on int340x thermal drivers
    (Srinivas Pandruvada, Zhang Rui, Sumeet Pawnikar)

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux:
  drivers: thermal: processor_thermal: Downgrade error message
  mlxsw: Remove obsolete dependency on THERMAL=m
  hwmon/drivers/core: Simplify complex dependency
  thermal/drivers/core: Fix typo in the option name
  thermal/drivers/core: Remove depends on THERMAL in Kconfig
  thermal/drivers/core: Remove module unload code
  thermal/drivers/core: Remove the module Kconfig's option
  thermal: core: skip update disabled thermal zones after suspend
  thermal: make device_register's type argument const
  thermal: intel: int340x: processor_thermal_device: simplify to get driver data
  thermal/int3403_thermal: favor _TMP instead of PTYP
---

2c45e7fbc962be1b03f2c2af817a76f5ba810af2
diff --cc include/linux/thermal.h
index 4a22099,42ddaaf..15a4ca5
--- a/include/linux/thermal.h
+++ b/include/linux/thermal.h
@@@ -442,16 -442,11 +442,16 @@@ void thermal_zone_device_update(struct 
  				enum thermal_notify_event);
  void thermal_zone_set_trips(struct thermal_zone_device *);
  
- struct thermal_cooling_device *thermal_cooling_device_register(char *, void *,
- 		const struct thermal_cooling_device_ops *);
+ struct thermal_cooling_device *thermal_cooling_device_register(const char *,
+ 		void *, const struct thermal_cooling_device_ops *);
  struct thermal_cooling_device *
- thermal_of_cooling_device_register(struct device_node *np, char *, void *,
+ thermal_of_cooling_device_register(struct device_node *np, const char *, void *,
  				   const struct thermal_cooling_device_ops *);
 +struct thermal_cooling_device *
 +devm_thermal_of_cooling_device_register(struct device *dev,
 +				struct device_node *np,
 +				char *type, void *devdata,
 +				const struct thermal_cooling_device_ops *ops);
  void thermal_cooling_device_unregister(struct thermal_cooling_device *);
  struct thermal_zone_device *thermal_zone_get_zone_by_name(const char *name);
  int thermal_zone_get_temp(struct thermal_zone_device *tz, int *temp);