From: Amit Daniel Kachhap <amit.daniel@samsung.com>
To: linux-pm@vger.kernel.org
Cc: Zhang Rui <rui.zhang@intel.com>,
linux-samsung-soc@vger.kernel.org, linux-kernel@vger.kernel.org,
amit.kachhap@gmail.com, Kukjin Kim <kgene.kim@samsung.com>,
Eduardo Valentin <eduardo.valentin@ti.com>
Subject: [PATCH V2 12/20] thermal: exynos: Modify private_data to appropriate name driver_data
Date: Fri, 26 Apr 2013 16:07:43 +0530 [thread overview]
Message-ID: <1366972671-9227-13-git-send-email-amit.daniel@samsung.com> (raw)
In-Reply-To: <1366972671-9227-1-git-send-email-amit.daniel@samsung.com>
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>
Signed-off-by: Amit Daniel Kachhap <amit.daniel@samsung.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 d4cd5ec..c0e4bdb 100644
--- a/drivers/thermal/samsung/exynos_thermal_common.c
+++ b/drivers/thermal/samsung/exynos_thermal_common.c
@@ -226,7 +226,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;
@@ -245,7 +245,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 26fdf8d..878120b 100644
--- a/drivers/thermal/samsung/exynos_thermal_common.h
+++ b/drivers/thermal/samsung/exynos_thermal_common.h
@@ -76,7 +76,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 133d3f5..bdf40ef 100644
--- a/drivers/thermal/samsung/exynos_tmu.c
+++ b/drivers/thermal/samsung/exynos_tmu.c
@@ -482,7 +482,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];
--
1.7.1
next prev parent reply other threads:[~2013-04-26 10:37 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-26 10:37 [PATCH V2 0/20] thermal: exynos: Add thermal driver for exynos5440 Amit Daniel Kachhap
2013-04-26 10:37 ` [PATCH V2 01/20] thermal: exynos: Moving exynos thermal files into samsung directory Amit Daniel Kachhap
2013-05-06 15:05 ` Zhang Rui
2013-05-07 10:21 ` Tomasz Figa
2013-05-07 13:18 ` amit daniel kachhap
2013-05-07 13:36 ` Tomasz Figa
2013-05-07 13:12 ` amit daniel kachhap
2013-04-26 10:37 ` [PATCH V2 02/20] thermal: exynos: Bifurcate exynos thermal common and tmu controller code Amit Daniel Kachhap
2013-05-06 15:16 ` Zhang Rui
2013-05-07 13:32 ` amit daniel kachhap
2013-04-26 10:37 ` [PATCH V2 03/20] thermal: exynos: Rename exynos_thermal.c to exynos_tmu.c Amit Daniel Kachhap
2013-05-06 15:18 ` Zhang Rui
2013-04-26 10:37 ` [PATCH V2 04/20] thermal: exynos: Move exynos_thermal.h from include/* to driver/* folder Amit Daniel Kachhap
2013-05-06 15:19 ` Zhang Rui
2013-04-26 10:37 ` [PATCH V2 05/20] thermal: exynos: Bifurcate exynos tmu driver and configuration data Amit Daniel Kachhap
2013-05-06 15:28 ` Zhang Rui
2013-04-26 10:37 ` [PATCH V2 06/20] thermal: exynos: Add missing definations and code cleanup Amit Daniel Kachhap
2013-04-26 10:37 ` [PATCH V2 07/20] thermal: exynos: Add extra entries in the tmu platform data Amit Daniel Kachhap
2013-04-26 10:37 ` [PATCH V2 08/20] thermal: exynos: Support thermal tripping Amit Daniel Kachhap
2013-04-26 10:37 ` [PATCH V2 09/20] thermal: exynos: Move register definitions from driver file to data file Amit Daniel Kachhap
2013-04-26 10:37 ` [PATCH V2 10/20] thermal: exynos: Fix to clear only the generated interrupts Amit Daniel Kachhap
2013-04-26 10:37 ` [PATCH V2 11/20] thermal: exynos: Add support for instance based register/unregister Amit Daniel Kachhap
2013-04-26 10:37 ` Amit Daniel Kachhap [this message]
2013-04-26 10:37 ` [PATCH V2 13/20] thermal: exynos: Return success even if no cooling data supplied Amit Daniel Kachhap
2013-04-26 10:37 ` [PATCH V2 14/20] thermal: exynos: Make the zone handling dependent on trip count Amit Daniel Kachhap
2013-04-26 10:37 ` [PATCH V2 15/20] thermal: exynos: Add support to handle many instances of TMU Amit Daniel Kachhap
2013-04-26 10:37 ` [PATCH V2 16/20] thermal: exynos: Add features to check instead of SOC type Amit Daniel Kachhap
2013-04-26 10:37 ` [PATCH V2 17/20] ARM: dts: thermal: exynos4: Add documentation for Exynos SoC thermal bindings Amit Daniel Kachhap
2013-04-26 10:37 ` [PATCH V2 18/20] thermal: exynos: Add support for exynos5440 TMU sensor Amit Daniel Kachhap
2013-04-26 10:37 ` [PATCH V2 19/20] Documentation: thermal: Explain the exynos thermal driver model Amit Daniel Kachhap
2013-04-26 10:37 ` [PATCH V2 20/20] ARM: dts: Add device tree node for exynos5440 TMU controller Amit Daniel Kachhap
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1366972671-9227-13-git-send-email-amit.daniel@samsung.com \
--to=amit.daniel@samsung.com \
--cc=amit.kachhap@gmail.com \
--cc=eduardo.valentin@ti.com \
--cc=kgene.kim@samsung.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=linux-samsung-soc@vger.kernel.org \
--cc=rui.zhang@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).