evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

thermal: exynos: Modify private_data to appropriate name driver_data

Browse source 
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: Kukjin Kim <kgene.kim@samsung.com>
Acked-by: Jonghwa Lee <jonghwa3.lee@samsung.com>
Acked-by: Eduardo Valentin <eduardo.valentin@ti.com>
Signed-off-by: Amit Daniel Kachhap <amit.daniel@samsung.com>
Signed-off-by: Eduardo Valentin <eduardo.valentin@ti.com>
This commit is contained in:
Amit Daniel Kachhap 2013-06-24 16:20:35 +05:30 • committed by Eduardo Valentin
parent 4de0bdaa96
commit d58f0a6d8d
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
drivers/thermal/samsung/exynos_thermal_common.c
View file

@ -222,7 +222,7 @@ static int exynos_get_temp(struct thermal_zone_device *thermal,
pr_info("Temperature sensor not initialised\n"); pr_info("Temperature sensor not initialised\n");
return -EINVAL; return -EINVAL;
} }
data = th_zone->sensor_conf->private_data; data = th_zone->sensor_conf->driver_data;
*temp = th_zone->sensor_conf->read_temperature(data); *temp = th_zone->sensor_conf->read_temperature(data);
/* convert the temperature into millicelsius */ /* convert the temperature into millicelsius */
*temp = *temp * MCELSIUS; *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"); pr_info("Temperature sensor not initialised\n");
return -EINVAL; return -EINVAL;
} }
data = th_zone->sensor_conf->private_data; data = th_zone->sensor_conf->driver_data;
if (th_zone->sensor_conf->write_emul_temp) if (th_zone->sensor_conf->write_emul_temp)
ret = th_zone->sensor_conf->write_emul_temp(data, temp); ret = th_zone->sensor_conf->write_emul_temp(data, temp);
return ret; return ret;

2
drivers/thermal/samsung/exynos_thermal_common.h
View file

@ -84,7 +84,7 @@ struct thermal_sensor_conf {
int (*write_emul_temp)(void *drv_data, unsigned long temp); int (*write_emul_temp)(void *drv_data, unsigned long temp);
struct thermal_trip_point_conf trip_data; struct thermal_trip_point_conf trip_data;
struct thermal_cooling_conf cooling_data; struct thermal_cooling_conf cooling_data;
void *private_data; void *driver_data;
void *pzone_data; void *pzone_data;
}; };

2
drivers/thermal/samsung/exynos_tmu.c
View file

@ -504,7 +504,7 @@ static int exynos_tmu_probe(struct platform_device *pdev)
exynos_tmu_control(pdev, true); exynos_tmu_control(pdev, true);
/* Register the sensor with thermal management interface */ /* 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] + exynos_sensor_conf.trip_data.trip_count = pdata->trigger_enable[0] +
pdata->trigger_enable[1] + pdata->trigger_enable[2]+ pdata->trigger_enable[1] + pdata->trigger_enable[2]+
pdata->trigger_enable[3]; pdata->trigger_enable[3];