linux-pm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Daniel Lezcano <daniel.lezcano@linaro.org>
To: rui.zhang@intel.com, edubezval@gmail.com
Cc: daniel.lezcano@linaro.org, linux-pm@vger.kernel.org,
	kevin.wangtao@linaro.org, leo.yan@linaro.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH V2 12/13] thermal/drivers/hisi: Remove thermal data back pointer
Date: Mon,  4 Sep 2017 21:56:11 +0200	[thread overview]
Message-ID: <1504554972-2624-12-git-send-email-daniel.lezcano@linaro.org> (raw)
In-Reply-To: <1504554972-2624-1-git-send-email-daniel.lezcano@linaro.org>

The presence of the thermal data pointer in the sensor structure has the unique
purpose of accessing the thermal data in the interrupt handler.

The sensor pointer is passed when registering the interrupt handler, replace the
cookie by the thermal data pointer, so the back pointer is no longer needed.

Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
---
 drivers/thermal/hisi_thermal.c | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c
index 0c06d14..cce3d10 100644
--- a/drivers/thermal/hisi_thermal.c
+++ b/drivers/thermal/hisi_thermal.c
@@ -47,7 +47,6 @@
 #define HISI_DEFAULT_SENSOR		2
 
 struct hisi_thermal_sensor {
-	struct hisi_thermal_data *thermal;
 	struct thermal_zone_device *tzd;
 	uint32_t id;
 	uint32_t thres_temp;
@@ -211,10 +210,10 @@ static void hisi_thermal_disable_sensor(struct hisi_thermal_data *data)
 	mutex_unlock(&data->thermal_lock);
 }
 
-static int hisi_thermal_get_temp(void *_sensor, int *temp)
+static int hisi_thermal_get_temp(void *__data, int *temp)
 {
-	struct hisi_thermal_sensor *sensor = _sensor;
-	struct hisi_thermal_data *data = sensor->thermal;
+	struct hisi_thermal_data *data = __data;
+	struct hisi_thermal_sensor *sensor = &data->sensor;
 
 	*temp = hisi_thermal_get_temperature(data->regs);
 
@@ -262,10 +261,10 @@ static int hisi_thermal_register_sensor(struct platform_device *pdev,
 	const struct thermal_trip *trip;
 
 	sensor->id = index;
-	sensor->thermal = data;
 
 	sensor->tzd = devm_thermal_zone_of_sensor_register(&pdev->dev,
-				sensor->id, sensor, &hisi_of_thermal_ops);
+							   sensor->id, data,
+							   &hisi_of_thermal_ops);
 	if (IS_ERR(sensor->tzd)) {
 		ret = PTR_ERR(sensor->tzd);
 		sensor->tzd = NULL;
-- 
2.7.4

  parent reply	other threads:[~2017-09-04 19:56 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-04 19:56 [PATCH V2 01/13] thermal/drivers/hisi: Fix missing interrupt enablement Daniel Lezcano
2017-09-04 19:56 ` [PATCH V2 02/13] thermal/drivers/hisi: Remove the multiple sensors support Daniel Lezcano
2017-09-04 19:56 ` [PATCH V2 03/13] thermal/drivers/hisi: Fix kernel panic on alarm interrupt Daniel Lezcano
2017-09-04 19:56 ` [PATCH V2 04/13] thermal/drivers/hisi: Simplify the temperature/step computation Daniel Lezcano
2017-09-04 19:56 ` [PATCH V2 05/13] thermal/drivers/hisi: Fix multiple alarm interrupts firing Daniel Lezcano
2017-09-04 19:56 ` [PATCH V2 06/13] thermal/drivers/hisi: Remove pointless lock Daniel Lezcano
2017-09-08  3:16   ` Eduardo Valentin
2017-09-08  9:31     ` Daniel Lezcano
2017-09-04 19:56 ` [PATCH V2 07/13] thermal/drivers/hisi: Encapsulate register writes into helpers Daniel Lezcano
2017-09-04 19:56 ` [PATCH V2 08/13] thermal/drivers/hisi: Fix configuration register setting Daniel Lezcano
2017-09-04 19:56 ` [PATCH V2 09/13] thermal/drivers/hisi: Remove costly sensor inspection Daniel Lezcano
2017-09-08  3:22   ` Eduardo Valentin
2017-09-08  9:50     ` Daniel Lezcano
2017-09-04 19:56 ` [PATCH V2 10/13] thermal/drivers/hisi: Rename and remove unused field Daniel Lezcano
2017-09-04 19:56 ` [PATCH V2 11/13] thermal/drivers/hisi: Convert long to int Daniel Lezcano
2017-09-04 19:56 ` Daniel Lezcano [this message]
2017-09-04 19:56 ` [PATCH V2 13/13] thermal/drivers/hisi: Remove mutex_lock in the code Daniel Lezcano
2017-09-08  3:25   ` Eduardo Valentin

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=1504554972-2624-12-git-send-email-daniel.lezcano@linaro.org \
    --to=daniel.lezcano@linaro.org \
    --cc=edubezval@gmail.com \
    --cc=kevin.wangtao@linaro.org \
    --cc=leo.yan@linaro.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@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).