aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/thermal
diff options
context:
space:
mode:
authorAmit Daniel Kachhap <amit.daniel@samsung.com>2013-06-24 06:50:35 -0400
committerEduardo Valentin <eduardo.valentin@ti.com>2013-08-13 09:52:01 -0400
commitd58f0a6d8dd6af9f6b4fc4cb5f3f3c1379efc2ef (patch)
tree61a89991b41695bec9b1b599d5512447bfc90f75 /drivers/thermal
parent4de0bdaa9677d11406c9becb70c60887c957e1f0 (diff)
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: 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>
Diffstat (limited to 'drivers/thermal')
-rw-r--r--drivers/thermal/samsung/exynos_thermal_common.c4
-rw-r--r--drivers/thermal/samsung/exynos_thermal_common.h2
-rw-r--r--drivers/thermal/samsung/exynos_tmu.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/thermal/samsung/exynos_thermal_common.c b/drivers/thermal/samsung/exynos_thermal_common.c
index 0b014e8bccf0..c6eab8c5316f 100644
--- a/drivers/thermal/samsung/exynos_thermal_common.c
+++ b/drivers/thermal/samsung/exynos_thermal_common.c
@@ -222,7 +222,7 @@ static int exynos_get_temp(struct thermal_zone_device *thermal,
222 pr_info("Temperature sensor not initialised\n"); 222 pr_info("Temperature sensor not initialised\n");
223 return -EINVAL; 223 return -EINVAL;
224 } 224 }
225 data = th_zone->sensor_conf->private_data; 225 data = th_zone->sensor_conf->driver_data;
226 *temp = th_zone->sensor_conf->read_temperature(data); 226 *temp = th_zone->sensor_conf->read_temperature(data);
227 /* convert the temperature into millicelsius */ 227 /* convert the temperature into millicelsius */
228 *temp = *temp * MCELSIUS; 228 *temp = *temp * MCELSIUS;
@@ -241,7 +241,7 @@ static int exynos_set_emul_temp(struct thermal_zone_device *thermal,
241 pr_info("Temperature sensor not initialised\n"); 241 pr_info("Temperature sensor not initialised\n");
242 return -EINVAL; 242 return -EINVAL;
243 } 243 }
244 data = th_zone->sensor_conf->private_data; 244 data = th_zone->sensor_conf->driver_data;
245 if (th_zone->sensor_conf->write_emul_temp) 245 if (th_zone->sensor_conf->write_emul_temp)
246 ret = th_zone->sensor_conf->write_emul_temp(data, temp); 246 ret = th_zone->sensor_conf->write_emul_temp(data, temp);
247 return ret; 247 return ret;
diff --git a/drivers/thermal/samsung/exynos_thermal_common.h b/drivers/thermal/samsung/exynos_thermal_common.h
index 86c1f848c850..6ca3096568e4 100644
--- a/drivers/thermal/samsung/exynos_thermal_common.h
+++ b/drivers/thermal/samsung/exynos_thermal_common.h
@@ -84,7 +84,7 @@ struct thermal_sensor_conf {
84 int (*write_emul_temp)(void *drv_data, unsigned long temp); 84 int (*write_emul_temp)(void *drv_data, unsigned long temp);
85 struct thermal_trip_point_conf trip_data; 85 struct thermal_trip_point_conf trip_data;
86 struct thermal_cooling_conf cooling_data; 86 struct thermal_cooling_conf cooling_data;
87 void *private_data; 87 void *driver_data;
88 void *pzone_data; 88 void *pzone_data;
89}; 89};
90 90
diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c
index a7bba693be4f..40e0cfd3e84f 100644
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -504,7 +504,7 @@ static int exynos_tmu_probe(struct platform_device *pdev)
504 exynos_tmu_control(pdev, true); 504 exynos_tmu_control(pdev, true);
505 505
506 /* Register the sensor with thermal management interface */ 506 /* Register the sensor with thermal management interface */
507 (&exynos_sensor_conf)->private_data = data; 507 (&exynos_sensor_conf)->driver_data = data;
508 exynos_sensor_conf.trip_data.trip_count = pdata->trigger_enable[0] + 508 exynos_sensor_conf.trip_data.trip_count = pdata->trigger_enable[0] +
509 pdata->trigger_enable[1] + pdata->trigger_enable[2]+ 509 pdata->trigger_enable[1] + pdata->trigger_enable[2]+
510 pdata->trigger_enable[3]; 510 pdata->trigger_enable[3];