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

Commit d58f0a6d authored by Amit Daniel Kachhap's avatar Amit Daniel Kachhap Committed by Eduardo Valentin
Browse files

thermal: exynos: Modify private_data to appropriate name driver_data 



This patch renames member private_data to driver_data of the thermal
zone registration structure as this item stores the driver related
data and uses it to call the driver related callbacks.

Acked-by: default avatarKukjin Kim <kgene.kim@samsung.com>
Acked-by: default avatarJonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: default avatarEduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: default avatarAmit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: default avatarEduardo Valentin <eduardo.valentin@ti.com>
parent 4de0bdaa

drivers/thermal/samsung/exynos_thermal_common.c

+2 −2
Original line number Diff line number Diff line
@@ -222,7 +222,7 @@ static int exynos_get_temp(struct thermal_zone_device *thermal, 
		pr_info("Temperature sensor not initialised\n");

		return -EINVAL;

	}

	data = th_zone->sensor_conf->private_data;

	data = th_zone->sensor_conf->driver_data;

	*temp = th_zone->sensor_conf->read_temperature(data);

	/* convert the temperature into millicelsius */

	*temp = *temp * MCELSIUS;
@@ -241,7 +241,7 @@ static int exynos_set_emul_temp(struct thermal_zone_device *thermal, 
		pr_info("Temperature sensor not initialised\n");

		return -EINVAL;

	}

	data = th_zone->sensor_conf->private_data;

	data = th_zone->sensor_conf->driver_data;

	if (th_zone->sensor_conf->write_emul_temp)

		ret = th_zone->sensor_conf->write_emul_temp(data, temp);

	return ret;

drivers/thermal/samsung/exynos_thermal_common.h

+1 −1
Original line number Diff line number Diff line
@@ -84,7 +84,7 @@ struct thermal_sensor_conf { 
	int (*write_emul_temp)(void *drv_data, unsigned long temp);

	struct thermal_trip_point_conf trip_data;

	struct thermal_cooling_conf cooling_data;

	void *private_data;

	void *driver_data;

	void *pzone_data;

};

drivers/thermal/samsung/exynos_tmu.c

+1 −1
Original line number Diff line number Diff line
@@ -504,7 +504,7 @@ static int exynos_tmu_probe(struct platform_device *pdev) 
	exynos_tmu_control(pdev, true);



	/* Register the sensor with thermal management interface */

	(&exynos_sensor_conf)->private_data = data;

	(&exynos_sensor_conf)->driver_data = data;

	exynos_sensor_conf.trip_data.trip_count = pdata->trigger_enable[0] +

			pdata->trigger_enable[1] + pdata->trigger_enable[2]+

			pdata->trigger_enable[3];