Merge tag 'thermal-v6.0-rc2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux

rafaeljw · rafaeljw · commit d92e600f860b · 2022-08-20T13:49:17.000+02:00
Pull thermal control fixes for 6.0-rc3 from Daniel Lezcano:

"- Fix missing required property for thermal zone description (Daniel
   Lezcano)

 - Add missing export symbol for
   thermal_zone_device_register_with_trips() (Daniel Lezcano)"

* tag 'thermal-v6.0-rc2' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/thermal/linux:
  dt-bindings: thermal: Fix missing required property
  thermal/core: Add missing EXPORT_SYMBOL_GPL
diff --git a/Documentation/devicetree/bindings/thermal/thermal-zones.yaml b/Documentation/devicetree/bindings/thermal/thermal-zones.yaml
@@ -214,6 +214,7 @@ patternProperties:
       - polling-delay
       - polling-delay-passive
       - thermal-sensors
+      - trips
 
     additionalProperties: false
 
diff --git a/drivers/thermal/thermal_core.c b/drivers/thermal/thermal_core.c
@@ -1329,6 +1329,7 @@ thermal_zone_device_register_with_trips(const char *type, struct thermal_trip *t
 	kfree(tz);
 	return ERR_PTR(result);
 }
+EXPORT_SYMBOL_GPL(thermal_zone_device_register_with_trips);
 
 struct thermal_zone_device *thermal_zone_device_register(const char *type, int ntrips, int mask,
 							 void *devdata, struct thermal_zone_device_ops *ops,

Original file line number	Diff line number	Diff line change
`@@ -1329,6 +1329,7 @@ thermal_zone_device_register_with_trips(const char type, struct thermal_trip t`
`1329`	`1329`	`kfree(tz);`
`1330`	`1330`	`return ERR_PTR(result);`
`1331`	`1331`	`}`
	`1332`	`+EXPORT_SYMBOL_GPL(thermal_zone_device_register_with_trips);`
`1332`	`1333`
`1333`	`1334`	`struct thermal_zone_device thermal_zone_device_register(const char type, int ntrips, int mask,`
`1334`	`1335`	`void devdata, struct thermal_zone_device_ops ops,`