UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

thermal/drivers/hisi: Set the thermal zone private data to the sensor pointer 

Store the sensor pointer in the thermal zone private data and use it
in the callback functions. That allows to continue the conversion to
sensor oriented code where the pointers are the sensors.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Signed-off-by: Eduardo Valentin <edubezval@gmail.com>
This commit is contained in:
Daniel Lezcano 2018-09-25 11:03:01 +02:00 committed by Eduardo Valentin
parent 9c9ae8da71
commit 49e778d1c7
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/thermal/hisi_thermal.c
View File

@ -442,8 +442,8 @@ static int hi3660_thermal_probe(struct hisi_thermal_data *data)
static int hisi_thermal_get_temp(void *__data, int *temp) static int hisi_thermal_get_temp(void *__data, int *temp)
{ {
struct hisi_thermal_data *data = __data; struct hisi_thermal_sensor *sensor = __data;
struct hisi_thermal_sensor *sensor = &data->sensor; struct hisi_thermal_data *data = sensor->data;
*temp = data->ops->get_temp(sensor); *temp = data->ops->get_temp(sensor);
@ -465,7 +465,7 @@ static irqreturn_t hisi_thermal_alarm_irq_thread(int irq, void *dev)
data->ops->irq_handler(sensor); data->ops->irq_handler(sensor);
hisi_thermal_get_temp(data, &temp); hisi_thermal_get_temp(sensor, &temp);
if (temp >= sensor->thres_temp) { if (temp >= sensor->thres_temp) {
dev_crit(&data->pdev->dev, "THERMAL ALARM: %d > %d\n", dev_crit(&data->pdev->dev, "THERMAL ALARM: %d > %d\n",
@ -486,11 +486,10 @@ static int hisi_thermal_register_sensor(struct platform_device *pdev,
struct hisi_thermal_sensor *sensor) struct hisi_thermal_sensor *sensor)
{ {
int ret, i; int ret, i;
struct hisi_thermal_data *data = sensor->data;
const struct thermal_trip *trip; const struct thermal_trip *trip;
sensor->tzd = devm_thermal_zone_of_sensor_register(&pdev->dev, sensor->tzd = devm_thermal_zone_of_sensor_register(&pdev->dev,
sensor->id, data, sensor->id, sensor,
&hisi_of_thermal_ops); &hisi_of_thermal_ops);
if (IS_ERR(sensor->tzd)) { if (IS_ERR(sensor->tzd)) {
ret = PTR_ERR(sensor->tzd); ret = PTR_ERR(sensor->tzd);