Merge tag 'thermal-v5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/therma...

Pull thermal updates from Daniel Lezcano:

 - Fix Kconfig typo "acces" -> "access" (Colin Ian King)

 - Use dev_error_probe() to simplify the error handling on imx and imx8
   platforms (Anson Huang)

 - Use dedicated kobj_to_dev() instead of container_of() in the sysfs
   core code (Tian Tao)

 - Fix coding style by adding braces to a one line conditional statement
   on rcar (Geert Uytterhoeven)

 - Add DT binding documentation for the r8a774e1 platform and update the
   Kconfig description supporting RZ/G2 SoCs (Lad Prabhakar)

 - Simplify the return expression of stm_thermal_prepare on the stm32
   platform (Qinglang Miao)

 - Fix the unit in the function documentation for the idle injection
   cooling device (Zhuguang Qing)

 - Remove an unecessary mutex_init() in the core code (Qinglang Miao)

 - Add support for keep alive events in the core code and the specific
   int340x (Srinivas Pandruvada)

 - Remove unused thermal zone variable in devfreq and cpufreq cooling
   devices (Zhuguang Qing)

 - Add the A100's THS controller support (Yangtao Li)

 - Add power management on the omap3's bandgap sensor (Adam Ford)

 - Fix a missing nlmsg_free in the netlink core error path (Jing
   Xiangfeng)

* tag 'thermal-v5.10-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
  thermal: core: Adding missing nlmsg_free() in thermal_genl_sampling_temp()
  thermal: ti-soc-thermal: Enable addition power management
  thermal: sun8i: Add A100's THS controller support
  thermal: sun8i: add TEMP_CALIB_MASK for calibration data in sun50i_h6_ths_calibrate
  dt-bindings: thermal: sun8i: Add binding for A100's THS controller
  thermal: cooling: Remove unused variable *tz
  thermal: int340x: Add keep alive response method
  thermal: core: Add new event for sending keep alive notifications
  thermal: int340x: Provide notification for OEM variable change
  thermal: core: remove unnecessary mutex_init()
  thermal/idle_inject: Fix comment of idle_duration_us and name of latency_ns
  thermal: Kconfig: Update description for RCAR_GEN3_THERMAL config
  thermal: stm32: simplify the return expression of stm_thermal_prepare()
  dt-bindings: thermal: rcar-gen3-thermal: Add r8a774e1 support
  thermal: rcar_thermal: Add missing braces to conditional statement
  thermal: Use kobj_to_dev() instead of container_of()
  thermal: imx8mm: Use dev_err_probe() to simplify error handling
  thermal: imx: Use dev_err_probe() to simplify error handling
  drivers: thermal: Kconfig: fix spelling mistake "acces" -> "access"

diff --combined drivers/thermal/thermal_netlink.c
index da2891fcac891489f06bcfd2044d23492733a543,019f4812def6ce2db43cf9e481eb17a327273699..1234dbe95895112ccba9364512df7679c4cff499
--- 1/drivers/thermal/thermal_netlink.c
--- 2/drivers/thermal/thermal_netlink.c
+++ b/drivers/thermal/thermal_netlink.c
@@@ -78,7 -78,7 +78,7 @@@ int thermal_genl_sampling_temp(int id, 
        hdr = genlmsg_put(skb, 0, 0, &thermal_gnl_family, 0,
                          THERMAL_GENL_SAMPLING_TEMP);
        if (!hdr)
-               return -EMSGSIZE;
+               goto out_free;
  
        if (nla_put_u32(skb, THERMAL_GENL_ATTR_TZ_ID, id))
                goto out_cancel;
@@@ -93,6 -93,7 +93,7 @@@
        return 0;
  out_cancel:
        genlmsg_cancel(skb, hdr);
+ out_free:
        nlmsg_free(skb);
  
        return -EMSGSIZE;
@@@ -545,7 -546,7 +546,7 @@@ static int thermal_genl_cmd_dumpit(stru
  {
        struct param p = { .msg = skb };
        const struct genl_dumpit_info *info = genl_dumpit_info(cb);
 -      int cmd = info->ops->cmd;
 +      int cmd = info->op.cmd;
        int ret;
        void *hdr;
  
@@@ -601,7 -602,7 +602,7 @@@ out_free_msg
        return ret;
  }
  
 -static const struct genl_ops thermal_genl_ops[] = {
 +static const struct genl_small_ops thermal_genl_ops[] = {
        {
                .cmd = THERMAL_GENL_CMD_TZ_GET_ID,
                .validate = GENL_DONT_VALIDATE_STRICT | GENL_DONT_VALIDATE_DUMP,
@@@ -635,8 -636,8 +636,8 @@@ static struct genl_family thermal_gnl_f
        .version        = THERMAL_GENL_VERSION,
        .maxattr        = THERMAL_GENL_ATTR_MAX,
        .policy         = thermal_genl_policy,
 -      .ops            = thermal_genl_ops,
 -      .n_ops          = ARRAY_SIZE(thermal_genl_ops),
 +      .small_ops      = thermal_genl_ops,
 +      .n_small_ops    = ARRAY_SIZE(thermal_genl_ops),
        .mcgrps         = thermal_genl_mcgrps,
        .n_mcgrps       = ARRAY_SIZE(thermal_genl_mcgrps),
  };