| Message ID | 1371451599-31035-15-git-send-email-amit.daniel@samsung.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On 17-06-2013 02:46, Amit Daniel Kachhap wrote: > 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> > Signed-off-by: Amit Daniel Kachhap <amit.daniel@samsung.com> Acked-by: Eduardo Valentin <eduardo.valentin@ti.com> > --- > drivers/thermal/samsung/exynos_thermal_common.c | 4 ++-- > drivers/thermal/samsung/exynos_thermal_common.h | 2 +- > drivers/thermal/samsung/exynos_tmu.c | 2 +- > 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 2af1e3b..7064eb7 100644 > --- a/drivers/thermal/samsung/exynos_thermal_common.c > +++ b/drivers/thermal/samsung/exynos_thermal_common.c > @@ -221,7 +221,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; > @@ -240,7 +240,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; > diff --git a/drivers/thermal/samsung/exynos_thermal_common.h b/drivers/thermal/samsung/exynos_thermal_common.h > index a845c2d..1e9a326 100644 > --- a/drivers/thermal/samsung/exynos_thermal_common.h > +++ b/drivers/thermal/samsung/exynos_thermal_common.h > @@ -83,7 +83,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; > }; > > diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c > index a7bba69..40e0cfd 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) > 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]; >
diff --git a/drivers/thermal/samsung/exynos_thermal_common.c b/drivers/thermal/samsung/exynos_thermal_common.c index 2af1e3b..7064eb7 100644 --- a/drivers/thermal/samsung/exynos_thermal_common.c +++ b/drivers/thermal/samsung/exynos_thermal_common.c @@ -221,7 +221,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; @@ -240,7 +240,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; diff --git a/drivers/thermal/samsung/exynos_thermal_common.h b/drivers/thermal/samsung/exynos_thermal_common.h index a845c2d..1e9a326 100644 --- a/drivers/thermal/samsung/exynos_thermal_common.h +++ b/drivers/thermal/samsung/exynos_thermal_common.h @@ -83,7 +83,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; }; diff --git a/drivers/thermal/samsung/exynos_tmu.c b/drivers/thermal/samsung/exynos_tmu.c index a7bba69..40e0cfd 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) 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];