of-thermal API change
Eduardo Valentin
maintainerv4 cover of-thermal API change
Hello guys,
I am proposing this change in the of-thermal API to sensors. The only single change is how we represent the callbacks between sensor drivers and of-thermal.
Essentially, instead of passing callbacks as parameters of the registration function, now of-thermal users will pass an ops. It is a simple way of growing the callback API smoothly.
There are already proposals to grow this API. Thus I would like to change this before we start to introduce new callbacks here.
I changed the existing of-thermal users to adapt accordingly.
Let me know if you have objections.
BR,
Eduardo Valentin (1):
thermal: of: improve of-thermal sensor registration API
drivers/hwmon/lm75.c | 9 +++-- drivers/hwmon/ntc_thermistor.c | 6 +++- drivers/hwmon/tmp102.c | 6 +++- drivers/thermal/of-thermal.c | 40 ++++++++++------------ drivers/thermal/tegra_soctherm.c | 7 ++-- drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 8 +++-- include/linux/thermal.h | 24 +++++++++---- 7 files changed, 63 insertions(+), 37 deletions(-)
Signature · 1 line
2.1.3
Eduardo Valentin
maintainerPATCH v4 1/1 thermal: of: improve of-thermal sensor registration API
Different drivers request API extensions in of-thermal. For this reason, additional callbacks are required to fit the new drivers needs.
The current API implementation expects the registering sensor driver to provide a get_temp and get_trend callbacks as function parameters. As the amount of callbacks is growing, this patch changes the existing implementation to use a .ops field to hold all the of thermal callbacks to sensor drivers.
This patch also changes the existing of-thermal users to fit the new API design. No functional change is introduced in this patch.
--- drivers/hwmon/lm75.c | 9 +++-- drivers/hwmon/ntc_thermistor.c | 6 +++- drivers/hwmon/tmp102.c | 6 +++- drivers/thermal/of-thermal.c | 40 ++++++++++------------ drivers/thermal/tegra_soctherm.c | 7 ++-- drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 8 +++-- include/linux/thermal.h | 24 +++++++++---- 7 files changed, 63 insertions(+), 37 deletions(-)
---
Difference from V3:
- Keep the same behavior regarding callback checks. Change in behavior may be sent in a separate patch.
Difference from V2:
- Fix wrong assignment in tegra driver.
Difference from V1:
- Fix error handling when .get_trend is not provided.
drivers/hwmon/lm75.c +6 -3
@@ -176,6 +176,10 @@ static struct attribute *lm75_attrs[] = { };ATTRIBUTE_GROUPS (lm75); +static const struct thermal_zone_of_device_ops lm75_of_thermal_ops = { + .get_temp = lm75_read_temp, +}; +/*-----------------------------------------------------------------------*/ /* device probe and removal */
@@ -291,10 +295,9 @@ lm75_probe(struct i2c_client *client, const struct i2c_device_id *id)if (IS_ERR (data->hwmon_dev))return PTR_ERR (data->hwmon_dev); - data->tz =thermal_zone_of_sensor_register (data->hwmon_dev, -0 , + data->tz =thermal_zone_of_sensor_register (data->hwmon_dev,0 , data->hwmon_dev, - lm75_read_temp,NULL ); + &lm75_of_thermal_ops);if (IS_ERR (data->tz)) data->tz =NULL ;
drivers/hwmon/ntc_thermistor.c +5 -1
@@ -486,6 +486,10 @@ static const struct attribute_group ntc_attr_group = { .attrs = ntc_attributes, }; +static const struct thermal_zone_of_device_ops ntc_of_thermal_ops = { + .get_temp = ntc_read_temp, +}; +static int ntc_thermistor_probe (struct platform_device *pdev) { const struct of_device_id *of_id =
@@ -579,7 +583,7 @@ static int ntc_thermistor_probe(struct platform_device *pdev) pdev_id->name); data->tz =thermal_zone_of_sensor_register (data->dev,0 , data->dev, - ntc_read_temp,NULL ); + &ntc_of_thermal_ops);if (IS_ERR (data->tz)) {dev_dbg (&pdev->dev,"Failed to register to thermal fw.\n" ); data->tz =NULL ;
drivers/hwmon/tmp102.c +5 -1
@@ -158,6 +158,10 @@ ATTRIBUTE_GROUPS(tmp102);#define TMP102_CONFIG (TMP102_CONF_TM | TMP102_CONF_EM | TMP102_CONF_CR1)#define TMP102_CONFIG_RD_ONLY (TMP102_CONF_R0 | TMP102_CONF_R1 | TMP102_CONF_AL) +static const struct thermal_zone_of_device_ops tmp102_of_thermal_ops = { + .get_temp = tmp102_read_temp, +}; +static int tmp102_probe (struct i2c_client *client,const struct i2c_device_id *id) {
@@ -215,7 +219,7 @@ static int tmp102_probe(struct i2c_client *client, } tmp102->hwmon_dev = hwmon_dev; tmp102->tz =thermal_zone_of_sensor_register (hwmon_dev,0 , hwmon_dev, - tmp102_read_temp,NULL ); + &tmp102_of_thermal_ops);if (IS_ERR (tmp102->tz)) tmp102->tz =NULL ;
drivers/thermal/of-thermal.c +18 -22
@@ -30,6 +30,7 @@#include <linux/err.h> #include <linux/export.h> #include <linux/string.h> +#include <linux/thermal.h> #include "thermal_core.h"
@@ -77,8 +78,7 @@ struct __thermal_bind_params {* @num_tbps: number of thermal bind params * @tbps: an array of thermal bind params (0..num_tbps - 1) * @sensor_data: sensor private data used while reading temperature and trend -* @get_temp: sensor callback to read temperature -* @get_trend: sensor callback to read temperature trend +* @ops: set of callbacks to handle the thermal zone based on DT */ struct __thermal_zone {
@@ -96,8 +96,7 @@ struct __thermal_zone {/* sensor interface */ void *sensor_data; -int (*get_temp)(void *,long *); -int (*get_trend)(void *,long *); +const struct thermal_zone_of_device_ops *ops; };/*** DT thermal zone device callbacks ***/
@@ -107,10 +106,10 @@ static int of_thermal_get_temp(struct thermal_zone_device *tz, {struct __thermal_zone *data = tz->devdata; -if (!data->get_temp) +if (!data->ops->get_temp)return -EINVAL ; -return data->get_temp (data->sensor_data, temp); +return data->ops->get_temp (data->sensor_data, temp); } static int of_thermal_get_trend(struct thermal_zone_device *tz, int trip,
@@ -120,10 +119,10 @@ static int of_thermal_get_trend(struct thermal_zone_device *tz, int trip,long dev_trend;int r; -if (!data->get_trend) +if (!data->ops->get_trend)return -EINVAL ; - r = data->get_trend (data->sensor_data, &dev_trend); + r = data->ops->get_trend (data->sensor_data, &dev_trend);if (r)return r;
@@ -324,8 +323,7 @@ static struct thermal_zone_device_ops of_thermal_ops = {static struct thermal_zone_device *thermal_zone_of_add_sensor (struct device_node *zone,struct device_node *sensor,void *data, -int (*get_temp)(void *,long *), -int (*get_trend)(void *,long *)) +const struct thermal_zone_of_device_ops *ops) {struct thermal_zone_device *tzd;struct __thermal_zone *tz;
@@ -336,9 +334,11 @@ thermal_zone_of_add_sensor(struct device_node *zone, tz = tzd->devdata; +if (!ops) +return ERR_PTR (-EINVAL ); +mutex_lock (&tzd->lock); - tz->get_temp = get_temp; - tz->get_trend = get_trend; + tz->ops = ops; tz->sensor_data = data; tzd->ops->get_temp = of_thermal_get_temp;
@@ -356,8 +356,8 @@ thermal_zone_of_add_sensor(struct device_node *zone,* than one sensors * @data: a private pointer (owned by the caller) that will be passed * back, when a temperature reading is needed. -* @get_temp: a pointer to a function that reads the sensor temperature. -* @get_trend: a pointer to a function that reads the sensor temperature trend. +* @ops: struct thermal_zone_of_device *. Must contain at least .get_trend and +* .get_temp. * * This function will search the list of thermal zones described in device * tree and look for the zone that refer to the sensor device pointed by
@@ -382,9 +382,8 @@ thermal_zone_of_add_sensor(struct device_node *zone,* check the return value with help of IS_ERR() helper. */ struct thermal_zone_device * -thermal_zone_of_sensor_register (struct device *dev,int sensor_id, -void *data,int (*get_temp)(void *,long *), -int (*get_trend)(void *,long *)) +thermal_zone_of_sensor_register (struct device *dev,int sensor_id,void *data, +const struct thermal_zone_of_device_ops *ops) {struct device_node *np, *child, *sensor_np;
@@ -424,9 +423,7 @@ thermal_zone_of_sensor_register(struct device *dev, int sensor_id,if (sensor_specs.np == sensor_np && id == sensor_id) {of_node_put (np);return thermal_zone_of_add_sensor (child, sensor_np, - data, - get_temp, - get_trend); + data, ops); } }of_node_put (np);
@@ -468,8 +465,7 @@ void thermal_zone_of_sensor_unregister(struct device *dev, tzd->ops->get_temp =NULL ; tzd->ops->get_trend =NULL ; - tz->get_temp =NULL ; - tz->get_trend =NULL ; + tz->ops =NULL ; tz->sensor_data =NULL ;mutex_unlock (&tzd->lock); }
drivers/thermal/tegra_soctherm.c +5 -2
@@ -317,6 +317,10 @@ static int tegra_thermctl_get_temp(void *data, long *out_temp)return 0 ; } +static const struct thermal_zone_of_device_ops tegra_of_thermal_ops = { + .get_temp = tegra_thermctl_get_temp, +}; +static const struct of_device_id tegra_soctherm_of_match[] = { { .compatible ="nvidia,tegra124-soctherm" }, { },
@@ -416,8 +420,7 @@ static int tegra_soctherm_probe(struct platform_device *pdev) zone->shift = t124_thermctl_temp_zones[i].shift; tz =thermal_zone_of_sensor_register (&pdev->dev, i, zone, - tegra_thermctl_get_temp, -NULL ); + &tegra_of_thermal_ops);if (IS_ERR (tz)) { err =PTR_ERR (tz); dev_err(&pdev->dev, "failed to register sensor: %d\n",
drivers/thermal/ti-soc-thermal/ti-thermal-common.c +6 -2
@@ -286,6 +286,11 @@ static int ti_thermal_get_crit_temp(struct thermal_zone_device *thermal,return ti_thermal_get_trip_temp (thermal,OMAP_TRIP_NUMBER -1 , temp); } +static const struct thermal_zone_of_device_ops ti_of_thermal_ops = { + .get_temp = __ti_thermal_get_temp, + .get_trend = __ti_thermal_get_trend, +}; +static struct thermal_zone_device_ops ti_thermal_ops = { .get_temp = ti_thermal_get_temp, .get_trend = ti_thermal_get_trend,
@@ -333,8 +338,7 @@ int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id,/* in case this is specified by DT */ data->ti_thermal =thermal_zone_of_sensor_register (bgp->dev, id, - data, __ti_thermal_get_temp, - __ti_thermal_get_trend); + data, &ti_of_thermal_ops);if (IS_ERR (data->ti_thermal)) {/* Create thermal zone */ data->ti_thermal = thermal_zone_device_register(domain,
include/linux/thermal.h +18 -6
@@ -289,19 +289,31 @@ struct thermal_genl_event {enum events event; }; +/** +* struct thermal_zone_of_device_ops - scallbacks for handling DT based zones +* +* Mandatory: +* @get_temp: a pointer to a function that reads the sensor temperature. +* +* Optional: +* @get_trend: a pointer to a function that reads the sensor temperature trend. +*/ +struct thermal_zone_of_device_ops { +int (*get_temp)(void *,long *); +int (*get_trend)(void *,long *); +}; +/* Function declarations */ #ifdef CONFIG_THERMAL_OF struct thermal_zone_device * -thermal_zone_of_sensor_register (struct device *dev,int id, -void *data,int (*get_temp)(void *,long *), -int (*get_trend)(void *,long *)); +thermal_zone_of_sensor_register (struct device *dev,int id,void *data, +const struct thermal_zone_of_device_ops *);void 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,int (*get_temp)(void *,long *), -int (*get_trend)(void *,long *)) +thermal_zone_of_sensor_register (struct device *dev,int id,void *data, +const struct thermal_zone_of_device_ops *) {return NULL ; }
Signature · 1 line
2.1.3
Re: [PATCHv4 1/1] thermal: of: improve of-thermal sensor registration API
Quoted 11 lines · Eduardo Valentin
Different drivers request API extensions in of-thermal. For this reason, additional callbacks are required to fit the new drivers needs.
The current API implementation expects the registering sensor driver to provide a
get_tempandget_trendcallbacks as function parameters. As the amount of callbacks is growing, this patch changes the existing implementation to use a .ops field to hold all the of thermal callbacks to sensor drivers.This patch also changes the existing of-thermal users to fit the new API design. No functional change is introduced in this patch.
A good idea even if no ops were to be added!
Eduardo Valentin
maintainerRe: [PATCHv4 1/1] thermal: of: improve of-thermal sensor registration API
Alexander,
Quoted 10 lines · Alexandre Courbot
Quoted 9 lines · Eduardo Valentin
Different drivers request API extensions in of-thermal. For this reason, additional callbacks are required to fit the new drivers needs.
The current API implementation expects the registering sensor driver to provide a
get_tempandget_trendcallbacks as function parameters. As the amount of callbacks is growing, this patch changes the existing implementation to use a .ops field to hold all the of thermal callbacks to sensor drivers.
Quoted 6 lines
Quoted 2 lines
This patch also changes the existing of-thermal users to fit the new API design. No functional change is introduced in this patch.
A good idea even if no ops were to be added!
Reviewed-by Alexandre Courbot <[email protected]>
Thanks for reviewing.
Eduardo Valentin
Re: [PATCHv4 1/1] thermal: of: improve of-thermal sensor registration API
In reply to Eduardo ValentinHi Eduardo,
Quoted 366 lines
Different drivers request API extensions in of-thermal. For this reason, additional callbacks are required to fit the new drivers needs.
The current API implementation expects the registering sensor driver to provide a
get_tempandget_trendcallbacks as function parameters. As the amount of callbacks is growing, this patch changes the existing implementation to use a .ops field to hold all the of thermal callbacks to sensor drivers.This patch also changes the existing of-thermal users to fit the new API design. No functional change is introduced in this patch.
Cc Alexandre Courbot <[email protected]>Cc Grant Likely <[email protected]>Cc Guenter Roeck <[email protected]>Cc Jean Delvare <[email protected]>Cc Rob Herring <[email protected]>Cc Stephen Warren <[email protected]>Cc Thierry Reding <[email protected]>Cc Zhang Rui <[email protected]>Reviewed-by Lukasz Majewski <[email protected]>Signed-off-by Eduardo Valentin <[email protected]>--- drivers/hwmon/lm75.c | 9 +++-- drivers/hwmon/ntc_thermistor.c | 6 +++- drivers/hwmon/tmp102.c | 6 +++- drivers/thermal/of-thermal.c | 40 ++++++++++------------ drivers/thermal/tegra_soctherm.c | 7 ++-- drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 8 +++-- include/linux/thermal.h | 24 +++++++++---- 7 files changed, 63 insertions(+), 37 deletions(-) ---Difference from V3:
- Keep the same behavior regarding callback checks. Change in behavior may be sent in a separate patch.
Difference from V2:
- Fix wrong assignment in tegra driver.
Difference from V1:
- Fix error handling when .get_trend is not provided.drivers/hwmon/lm75.c +4
-0@@ -176,6 +176,10 @@ static struct attribute *lm75_attrs[] = { };ATTRIBUTE_GROUPS (lm75); +static const struct thermal_zone_of_device_ops lm75_of_thermal_ops = { + .get_temp = lm75_read_temp, +}; +/*-----------------------------------------------------------------------*/ /* device probe and removal */
drivers/hwmon/lm75.c +2
-3@@ -291,10 +295,9 @@ lm75_probe(struct i2c_client *client, const struct i2c_device_id *id) if (IS_ERR(data->hwmon_dev))return PTR_ERR (data->hwmon_dev); - data->tz =thermal_zone_of_sensor_register (data->hwmon_dev, -0 , + data->tz =thermal_zone_of_sensor_register (data->hwmon_dev,0 , data->hwmon_dev, - lm75_read_temp,NULL ); + &lm75_of_thermal_ops); if (IS_ERR(data->tz)) data->tz =NULL ;(quoted diff) +0
-0
b/drivers/hwmon/ntc_thermistor.cindex 4ff89b2..bca8521c8 100644drivers/hwmon/ntc_thermistor.c +5
-1@@ -486,6 +486,10 @@ static const struct attribute_group ntc_attr_group = { .attrs = ntc_attributes, }; +static const struct thermal_zone_of_device_ops ntc_of_thermal_ops = { + .get_temp = ntc_read_temp, +}; +static int ntc_thermistor_probe (struct platform_device *pdev) { const struct of_device_id *of_id =@@ -579,7 +583,7 @@ static int ntc_thermistor_probe(struct platform_device *pdev) pdev_id->name); data->tz =thermal_zone_of_sensor_register (data->dev,0 , data->dev, - ntc_read_temp,NULL ); + &ntc_of_thermal_ops);if (IS_ERR (data->tz)) { dev_dbg(&pdev->dev, "Failed to register to thermalfw.\n");
data->tz= NULL;drivers/hwmon/tmp102.c +0
-0@@ -158,6 +158,10 @@ ATTRIBUTE_GROUPS(tmp102);#define TMP102_CONFIG (TMP102_CONF_TM | TMP102_CONF_EM |
TMP102_CONF_CR1) #defineTMP102_CONFIG_RD_ONLY(TMP102_CONF_R0|TMP102_CONF_R1|TMP102_CONF_AL)
+static const structthermal_zone_of_device_opstmp102_of_thermal_ops= {drivers/hwmon/tmp102.c +4
-1+ .get_temp = tmp102_read_temp, +}; +static int tmp102_probe (struct i2c_client *client,const struct i2c_device_id *id) {@@ -215,7 +219,7 @@ static int tmp102_probe(struct i2c_client *client, } tmp102->hwmon_dev = hwmon_dev; tmp102->tz =thermal_zone_of_sensor_register (hwmon_dev,0 , hwmon_dev, - tmp102_read_temp,NULL ); + &tmp102_of_thermal_ops); if (IS_ERR(tmp102->tz))drivers/hwmon/tmp102.c +0
-0tmp102->tz =NULL ;(quoted diff) +0
-0
b/drivers/thermal/of-thermal.cindex f8eb625..e87ccdb 100644drivers/thermal/of-thermal.c +1
-0@@ -30,6 +30,7 @@#include <linux/err.h> #include <linux/export.h> #include <linux/string.h> +#include <linux/thermal.h> #include "thermal_core.h" @@ -77,8 +78,7 @@ struct __thermal_bind_params {* @num_tbps: number of thermal bind params * @tbps: an array of thermal bind params (0..num_tbps - 1) * @sensor_data: sensor private data used while reading temperature and trend
- * @get_temp: sensor callback to read temperature
- * @get_trend: sensor callback to read temperature trend
+ * @ops: set of callbacks to handle the thermal zone based on DT */struct
__thermal_zone{drivers/thermal/of-thermal.c +3
-4@@ -96,8 +96,7 @@ struct __thermal_zone {/* sensor interface */ void *sensor_data; -int (*get_temp)(void *,long *); -int (*get_trend)(void *,long *); +const struct thermal_zone_of_device_ops *ops; };/*** DT thermal zone device callbacks ***/ @@ -107,10 +106,10 @@ static int of_thermal_get_temp(struct thermal_zone_device *tz, {struct __thermal_zone *data = tz->devdata; -if (!data->get_temp) +if (!data->ops->get_temp)return -EINVAL ; -return data->get_temp (data->sensor_data, temp); +return data->ops->get_temp (data->sensor_data, temp); } static int of_thermal_get_trend(struct thermal_zone_device *tz, inttrip, @@ -120,10 +119,10 @@ static int of_thermal_get_trend(struct
thermal_zone_device*tz, int trip, longdev_trend;drivers/thermal/of-thermal.c +2
-2int r; -if (!data->get_trend) +if (!data->ops->get_trend)return -EINVAL ; - r = data->get_trend (data->sensor_data, &dev_trend); + r = data->ops->get_trend (data->sensor_data, &dev_trend);if (r)return r;@@ -324,8 +323,7 @@ static struct thermal_zone_device_ops
of_thermal_ops= { static structthermal_zone_device*
thermal_zone_of_add_sensor(structdevice_node*zone,drivers/thermal/of-thermal.c +1
-2struct device_node *sensor, void *data, - int (*get_temp)(void *, long *), - int (*get_trend)(void *, long *)) + const struct thermal_zone_of_device_ops*ops) {
drivers/thermal/of-thermal.c +4
-3struct thermal_zone_device *tzd;struct __thermal_zone *tz;@@ -336,9 +334,11 @@ thermal_zone_of_add_sensor(struct device_node *zone, tz = tzd->devdata; +if (!ops) +return ERR_PTR (-EINVAL ); +mutex_lock (&tzd->lock); - tz->get_temp = get_temp; - tz->get_trend = get_trend; + tz->ops = ops; tz->sensor_data = data; tzd->ops->get_temp = of_thermal_get_temp;@@ -356,8 +356,8 @@ thermal_zone_of_add_sensor(struct device_node *zone, * than one sensors * @data: a private pointer (owned by the caller) that will be passed * back, when a temperature reading is needed. - * @get_temp: a pointer to a function that reads the sensortemperature.
- * @get_trend: a pointer to a function that reads the sensor temperature trend.
+ * @ops: structthermal_zone_of_device*. Must contain at least .get_trend and
+ * .get_temp.
*
* This function will search the list of thermal zones described in
device
* tree and look for the zone that refer to the sensor device
pointed by @@ -382,9 +382,8 @@ thermal_zone_of_add_sensor(structdevice_node*zone,
* check the return value with help ofIS_ERR()helper. */
structthermal_zone_device*drivers/thermal/of-thermal.c +0
-2-thermal_zone_of_sensor_register(struct device *dev, int sensor_id, - void *data, int (*get_temp)(void *,long *),
drivers/thermal/of-thermal.c +1
-1- int (*get_trend)(void *, long *)) +thermal_zone_of_sensor_register(struct device *dev, int sensor_id,void *data,
drivers/thermal/of-thermal.c +1
-0+ const struct
thermal_zone_of_device_ops*ops) {drivers/thermal/of-thermal.c +1
-3struct device_node *np, *child, *sensor_np;@@ -424,9 +423,7 @@ thermal_zone_of_sensor_register(struct device *dev, int sensor_id, if (sensor_specs.np == sensor_np && id == sensor_id) { of_node_put(np);return thermal_zone_of_add_sensor (child, sensor_np, - data, - get_temp, - get_trend); + data, ops); } }drivers/thermal/of-thermal.c +1
-2of_node_put (np);@@ -468,8 +465,7 @@ void thermal_zone_of_sensor_unregister(struct device *dev, tzd->ops->get_temp =NULL ; tzd->ops->get_trend =NULL ; - tz->get_temp =NULL ; - tz->get_trend =NULL ; + tz->ops =NULL ; tz->sensor_data =NULL ;mutex_unlock (&tzd->lock); }(quoted diff) +0
-0
b/drivers/thermal/tegra_soctherm.cindex 70f7e9e..9197fc0 100644drivers/thermal/tegra_soctherm.c +4
-0@@ -317,6 +317,10 @@ static int tegra_thermctl_get_temp(void *data, long *out_temp) return 0; } +static const struct thermal_zone_of_device_ops tegra_of_thermal_ops = { + .get_temp = tegra_thermctl_get_temp, +}; +static const struct of_device_id tegra_soctherm_of_match[] = { { .compatible ="nvidia,tegra124-soctherm" },drivers/thermal/tegra_soctherm.c +0
-0{ },@@ -416,8 +420,7 @@ static int tegra_soctherm_probe(struct
platform_device*pdev)zone->shift= t124_thermctl_temp_zones[i].shift;
tz = thermal_zone_of_sensor_register(&pdev->dev, i,
zone,
-tegra_thermctl_get_temp,drivers/thermal/tegra_soctherm.c +1
-1- NULL); +
&tegra_of_thermal_ops); if (IS_ERR(tz)) {drivers/thermal/tegra_soctherm.c +0
-0err =PTR_ERR (tz); dev_err(&pdev->dev, "failed to registersensor: %d\n", diff --git
a/drivers/thermal/ti-soc-thermal/ti-thermal-common.cb/drivers/thermal/ti-soc-thermal/ti-thermal-common.cindex 9eec26d..5fd0386 100644 ---a/drivers/thermal/ti-soc-thermal/ti-thermal-common.c+++b/drivers/thermal/ti-soc-thermal/ti-thermal-common.c@@ -286,6 +286,11 @@ static int ti_thermal_get_crit_temp(structthermal_zone_device*thermal, returnti_thermal_get_trip_temp(thermal, OMAP_TRIP_NUMBER - 1, temp); }drivers/thermal/tegra_soctherm.c +6
-2+static const struct thermal_zone_of_device_ops ti_of_thermal_ops = { + .get_temp = __ti_thermal_get_temp, + .get_trend = __ti_thermal_get_trend, +}; +static struct thermal_zone_device_ops ti_thermal_ops = { .get_temp = ti_thermal_get_temp, .get_trend = ti_thermal_get_trend,@@ -333,8 +338,7 @@ int ti_thermal_expose_sensor(struct ti_bandgap *bgp, int id,/* in case this is specified by DT */ data->ti_thermal =thermal_zone_of_sensor_register (bgp->dev, id, - data, __ti_thermal_get_temp, - __ti_thermal_get_trend); + data, &ti_of_thermal_ops);if (IS_ERR (data->ti_thermal)) {/* Create thermal zone */
data->ti_thermal=
thermal_zone_device_register(domain, diff --gita/include/linux/thermal.hb/include/linux/thermal.hindex ef90838..b565964 100644 ---a/include/linux/thermal.h+++b/include/linux/thermal.hdrivers/thermal/tegra_soctherm.c +2
-0@@ -289,19 +289,31 @@ struct thermal_genl_event {enum events event; }; +/** +* struct thermal_zone_of_device_ops - scallbacks for handling DT based zones
+ *
+ * Mandatory:
+ * @get_temp: a pointer to a function that reads the sensor temperature.
+ *
+ * Optional:
+ * @get_trend: a pointer to a function that reads the sensor temperature trend.
+ */drivers/thermal/tegra_soctherm.c +5
-2+struct thermal_zone_of_device_ops { +int (*get_temp)(void *,long *); +int (*get_trend)(void *,long *); +}; +/* Function declarations */ #ifdef CONFIG_THERMAL_OF struct thermal_zone_device * -thermal_zone_of_sensor_register(struct device *dev, int id, - void *data, int (*get_temp)(void *,long *),
drivers/thermal/tegra_soctherm.c +1
-1- int (*get_trend)(void *, long *)); +thermal_zone_of_sensor_register(struct device *dev, int id, void*data,
drivers/thermal/tegra_soctherm.c +1
-0+ const struct
thermal_zone_of_device_ops*); voidthermal_zone_of_sensor_unregister(struct device *dev, struct thermal_zone_device *tz); #else
static inline structthermal_zone_device*drivers/thermal/tegra_soctherm.c +0
-2-thermal_zone_of_sensor_register(struct device *dev, int id, - void *data, int (*get_temp)(void *,long *),
drivers/thermal/tegra_soctherm.c +1
-1- int (*get_trend)(void *, long *)) +thermal_zone_of_sensor_register(struct device *dev, int id, void*data,
drivers/thermal/tegra_soctherm.c +1
-0+ const struct
Quoted 3 lines
thermal_zone_of_device_ops*) {
return NULL;
}
On which branch should I apply this patch?
I've tried to apply this patch on top of newest linux-soc-thermal/next:git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git
branch: next
SHA1:4027494124fd88e5d51127eebba315de5d8d57c8
Unfortunately, it conflicts with:
"thermal: fix multiple disbalanced device node counters" c2aad93c Vladimir Zapolskiy
Signature · 5 lines
Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
Eduardo Valentin
maintainerRe: [PATCHv4 1/1] thermal: of: improve of-thermal sensor registration API
Hey Lukasz,
Quoted 2 lines · Lukasz Majewski
Hi Eduardo,
<big cut>
Quoted 4 lines
Quoted 1 line
}
On which branch should I apply this patch?
This is based in my -linus branch. That means I will send this for the next major window, not rc. The branch -fixes of thermal-soc include patches for rc windows.
Quoted 8 lines
I've tried to apply this patch on top of newest linux-soc-thermal/next:
git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git
branch: next
SHA1:4027494124fd88e5d51127eebba315de5d8d57c8Unfortunately, it conflicts with:
"thermal: fix multiple disbalanced device node counters"c2aad93cVladimir Zapolskiy
The -next branch is intended to contain patches for linux-next testing. I include the content of -linus and -fixes together to be tested in linux-next.
However, as this patch has not been merged yet into -linus, I haven't rebuilt my -next branch.
Quoted 8 lines
Signature · 6 lines
-- Best regards, Lukasz Majewski Samsung R&D Institute Poland (SRPOL) | Linux Platform Group
Re: [PATCHv4 1/1] thermal: of: improve of-thermal sensor registration API
In reply to Eduardo ValentinQuoted 46 lines · Eduardo Valentin
Different drivers request API extensions in of-thermal. For this reason, additional callbacks are required to fit the new drivers needs.
The current API implementation expects the registering sensor driver to provide a
get_tempandget_trendcallbacks as function parameters. As the amount of callbacks is growing, this patch changes the existing implementation to use a .ops field to hold all the of thermal callbacks to sensor drivers.This patch also changes the existing of-thermal users to fit the new API design. No functional change is introduced in this patch.
Cc Alexandre Courbot <[email protected]>Cc Grant Likely <[email protected]>Cc Guenter Roeck <[email protected]>Cc Jean Delvare <[email protected]>Cc Rob Herring <[email protected]>Cc Stephen Warren <[email protected]>Cc Thierry Reding <[email protected]>Cc Zhang Rui <[email protected]>Reviewed-by Lukasz Majewski <[email protected]>Signed-off-by Eduardo Valentin <[email protected]>--- drivers/hwmon/lm75.c | 9 +++-- drivers/hwmon/ntc_thermistor.c | 6 +++- drivers/hwmon/tmp102.c | 6 +++- drivers/thermal/of-thermal.c | 40 ++++++++++------------ drivers/thermal/tegra_soctherm.c | 7 ++-- drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 8 +++-- include/linux/thermal.h | 24 +++++++++---- 7 files changed, 63 insertions(+), 37 deletions(-)---
Difference from V3:
- Keep the same behavior regarding callback checks. Change in behavior may be sent in a separate patch.
Difference from V2:
- Fix wrong assignment in tegra driver.
Difference from V1:
- Fix error handling when .get_trend is not provided.
drivers/thermal/of-thermal.c thermal_zone_of_add_sensor(struct device_node *zone, · line 360
Quoted 7 lines
drivers/thermal/of-thermal.c +2
-2@@ -356,8 +356,8 @@ thermal_zone_of_add_sensor(struct device_node *zone,* than one sensors * @data: a private pointer (owned by the caller) that will be passed * back, when a temperature reading is needed. -* @get_temp: a pointer to a function that reads the sensor temperature. -* @get_trend: a pointer to a function that reads the sensor temperature trend. +* @ops: struct thermal_zone_of_device *. Must contain at least .get_trend and +* .get_temp.
This comment seems to be incorrect, as .get_trend is optional.
drivers/thermal/of-thermal.c thermal_zone_of_add_sensor(struct device_node *zone, · line 363
Quoted 3 lines
drivers/thermal/of-thermal.c +0
-0* * This function will search the list of thermal zones described in device * tree and look for the zone that refer to the sensor device pointed by
With that minor one fixed,
Cheers,
Mikko
Re: [PATCHv4 1/1] thermal: of: improve of-thermal sensor registration API
Quoted 47 lines · Mikko Perttunen
Quoted 46 lines · Eduardo Valentin
Different drivers request API extensions in of-thermal. For this reason, additional callbacks are required to fit the new drivers needs.
The current API implementation expects the registering sensor driver to provide a
get_tempandget_trendcallbacks as function parameters. As the amount of callbacks is growing, this patch changes the existing implementation to use a .ops field to hold all the of thermal callbacks to sensor drivers.This patch also changes the existing of-thermal users to fit the new API design. No functional change is introduced in this patch.
Cc Alexandre Courbot <[email protected]>Cc Grant Likely <[email protected]>Cc Guenter Roeck <[email protected]>Cc Jean Delvare <[email protected]>Cc Rob Herring <[email protected]>Cc Stephen Warren <[email protected]>Cc Thierry Reding <[email protected]>Cc Zhang Rui <[email protected]>Reviewed-by Lukasz Majewski <[email protected]>Signed-off-by Eduardo Valentin <[email protected]>--- drivers/hwmon/lm75.c | 9 +++-- drivers/hwmon/ntc_thermistor.c | 6 +++- drivers/hwmon/tmp102.c | 6 +++- drivers/thermal/of-thermal.c | 40 ++++++++++------------ drivers/thermal/tegra_soctherm.c | 7 ++-- drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 8 +++-- include/linux/thermal.h | 24 +++++++++---- 7 files changed, 63 insertions(+), 37 deletions(-)---
Difference from V3:
- Keep the same behavior regarding callback checks. Change in behavior may be sent in a separate patch.
Difference from V2:
- Fix wrong assignment in tegra driver.
Difference from V1:
- Fix error handling when .get_trend is not provided.
Quoted 12 lines
Quoted 10 lines
drivers/thermal/of-thermal.c +0
-2@@ -356,8 +356,8 @@ thermal_zone_of_add_sensor(struct device_node *zone,* than one sensors * @data: a private pointer (owned by the caller) that will be passed * back, when a temperature reading is needed. -* @get_temp: a pointer to a function that reads the sensor temperature. -* @get_trend: a pointer to a function that reads the sensor temperature trend.
+ * @ops: structthermal_zone_of_device*. Must contain at least .get_trend and
+ * .get_temp.This comment seems to be incorrect, as .get_trend is optional.
Also, the parameter is of type struct thermal_zone_of_device_ops *, not just thermal_zone_of_device.
Quoted 18 lines
Quoted 6 lines
*
* This function will search the list of thermal zones described in
device
* tree and look for the zone that refer to the sensor device
pointed byWith that minor one fixed,
Tested-by Mikko Perttunen <[email protected]>Reviewed-by Mikko Perttunen <[email protected]>Cheers,
Mikko
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Eduardo Valentin
maintainerRe: [PATCHv4 1/1] thermal: of: improve of-thermal sensor registration API
Mikko,
Quoted 61 lines · Mikko Perttunen
Quoted 47 lines · Mikko Perttunen
Quoted 46 lines · Eduardo Valentin
Different drivers request API extensions in of-thermal. For this reason, additional callbacks are required to fit the new drivers needs.
The current API implementation expects the registering sensor driver to provide a
get_tempandget_trendcallbacks as function parameters. As the amount of callbacks is growing, this patch changes the existing implementation to use a .ops field to hold all the of thermal callbacks to sensor drivers.This patch also changes the existing of-thermal users to fit the new API design. No functional change is introduced in this patch.
Cc Alexandre Courbot <[email protected]>Cc Grant Likely <[email protected]>Cc Guenter Roeck <[email protected]>Cc Jean Delvare <[email protected]>Cc Rob Herring <[email protected]>Cc Stephen Warren <[email protected]>Cc Thierry Reding <[email protected]>Cc Zhang Rui <[email protected]>Reviewed-by Lukasz Majewski <[email protected]>Signed-off-by Eduardo Valentin <[email protected]>--- drivers/hwmon/lm75.c | 9 +++-- drivers/hwmon/ntc_thermistor.c | 6 +++- drivers/hwmon/tmp102.c | 6 +++- drivers/thermal/of-thermal.c | 40 ++++++++++------------ drivers/thermal/tegra_soctherm.c | 7 ++-- drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 8 +++-- include/linux/thermal.h | 24 +++++++++---- 7 files changed, 63 insertions(+), 37 deletions(-)---
Difference from V3:
- Keep the same behavior regarding callback checks. Change in behavior may be sent in a separate patch.
Difference from V2:
- Fix wrong assignment in tegra driver.
Difference from V1:
- Fix error handling when .get_trend is not provided.Quoted 12 lines
Quoted 10 lines
drivers/thermal/of-thermal.c +0
-2@@ -356,8 +356,8 @@ thermal_zone_of_add_sensor(struct device_node *zone,* than one sensors * @data: a private pointer (owned by the caller) that will be passed * back, when a temperature reading is needed. -* @get_temp: a pointer to a function that reads the sensor temperature. -* @get_trend: a pointer to a function that reads the sensor temperature trend.
+ * @ops: structthermal_zone_of_device*. Must contain at least .get_trend and
+ * .get_temp.This comment seems to be incorrect, as .get_trend is optional.
Quoted 14 lines
Also, the parameter is of type struct
thermal_zone_of_device_ops*, not justthermal_zone_of_device.Quoted 11 lines
Quoted 6 lines
*
* This function will search the list of thermal zones described in
device
* tree and look for the zone that refer to the sensor device
pointed byWith that minor one fixed,
Tested-by Mikko Perttunen <[email protected]>Reviewed-by Mikko Perttunen <[email protected]>
All the comments fixed now. Thanks for reviewing and testing.
Quoted 8 lines
Quoted 7 lines
Cheers,
Mikko
--
To unsubscribe from this list: send the line "unsubscribe linux-tegra" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Cheers,
Eduardo Valentin