Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 609f26dc authored by Daniel Lezcano's avatar Daniel Lezcano Committed by Eduardo Valentin
Browse files

thermal/drivers/hisi: Rename and remove unused field 



Rename the 'sensors' field to 'sensor' as we describe only one sensor.
Remove the 'sensor_temp' as it is no longer used.

Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
Reviewed-by: default avatarLeo Yan <leo.yan@linaro.org>
Tested-by: default avatarLeo Yan <leo.yan@linaro.org>
Signed-off-by: default avatarEduardo Valentin <edubezval@gmail.com>
parent 10d7e9a9

drivers/thermal/hisi_thermal.c

+8 −10
Original line number Diff line number Diff line
@@ -49,8 +49,6 @@ 
struct hisi_thermal_sensor {

	struct hisi_thermal_data *thermal;

	struct thermal_zone_device *tzd;



	long sensor_temp;

	uint32_t id;

	uint32_t thres_temp;

};
@@ -59,9 +57,9 @@ struct hisi_thermal_data { 
	struct mutex thermal_lock;    /* protects register data */

	struct platform_device *pdev;

	struct clk *clk;

	struct hisi_thermal_sensor sensors;

	int irq;

	struct hisi_thermal_sensor sensor;

	void __iomem *regs;

	int irq;

};



/*
@@ -233,7 +231,7 @@ static const struct thermal_zone_of_device_ops hisi_of_thermal_ops = { 
static irqreturn_t hisi_thermal_alarm_irq_thread(int irq, void *dev)

{

	struct hisi_thermal_data *data = dev;

	struct hisi_thermal_sensor *sensor = &data->sensors;

	struct hisi_thermal_sensor *sensor = &data->sensor;

	int temp;



	hisi_thermal_alarm_clear(data->regs, 1);
@@ -244,7 +242,7 @@ static irqreturn_t hisi_thermal_alarm_irq_thread(int irq, void *dev) 
		dev_crit(&data->pdev->dev, "THERMAL ALARM: %d > %d\n",

			 temp, sensor->thres_temp);



		thermal_zone_device_update(data->sensors.tzd,

		thermal_zone_device_update(data->sensor.tzd,

					   THERMAL_EVENT_UNSPECIFIED);



	} else if (temp < sensor->thres_temp) {
@@ -307,7 +305,7 @@ static int hisi_thermal_setup(struct hisi_thermal_data *data) 
{

	struct hisi_thermal_sensor *sensor;



	sensor = &data->sensors;

	sensor = &data->sensor;



	/* disable module firstly */

	hisi_thermal_reset_enable(data->regs, 0);
@@ -380,7 +378,7 @@ static int hisi_thermal_probe(struct platform_device *pdev) 
	}



	ret = hisi_thermal_register_sensor(pdev, data,

					   &data->sensors,

					   &data->sensor,

					   HISI_DEFAULT_SENSOR);

	if (ret) {

		dev_err(&pdev->dev, "failed to register thermal sensor: %d\n",
@@ -402,7 +400,7 @@ static int hisi_thermal_probe(struct platform_device *pdev) 
		return ret;

	}



	hisi_thermal_toggle_sensor(&data->sensors, true);

	hisi_thermal_toggle_sensor(&data->sensor, true);



	return 0;

}
@@ -410,7 +408,7 @@ static int hisi_thermal_probe(struct platform_device *pdev) 
static int hisi_thermal_remove(struct platform_device *pdev)

{

	struct hisi_thermal_data *data = platform_get_drvdata(pdev);

	struct hisi_thermal_sensor *sensor = &data->sensors;

	struct hisi_thermal_sensor *sensor = &data->sensor;



	hisi_thermal_toggle_sensor(sensor, false);

	hisi_thermal_disable_sensor(data);