From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: linux-pm@vger.kernel.org
Cc: Andrey Smirnov <andrew.smirnov@gmail.com>,
Chris Healy <cphealy@gmail.com>,
Lucas Stach <l.stach@pengutronix.de>,
Zhang Rui <rui.zhang@intel.com>,
Eduardo Valentin <edubezval@gmail.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
linux-imx@nxp.com, linux-kernel@vger.kernel.org
Subject: [PATCH v2 06/13] thermal: qoriq: Embed per-sensor data into struct qoriq_tmu_data
Date: Fri, 22 Feb 2019 12:05:01 -0800 [thread overview]
Message-ID: <20190222200508.26325-7-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20190222200508.26325-1-andrew.smirnov@gmail.com>
Embed per-sensor data into struct qoriq_tmu_data so we can drop the
code allocating it. This also allows us to get rid of per-sensor back
reference to struct qoriq_tmu_data since now its address can be
caluclated using container_of().
Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Zhang Rui <rui.zhang@intel.com>
Cc: Eduardo Valentin <edubezval@gmail.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: linux-imx@nxp.com
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
drivers/thermal/qoriq_thermal.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c
index e281bdcfa11f..deb5cb6a0baf 100644
--- a/drivers/thermal/qoriq_thermal.c
+++ b/drivers/thermal/qoriq_thermal.c
@@ -59,22 +59,24 @@ struct qoriq_tmu_regs {
u32 ttr3cr; /* Temperature Range 3 Control Register */
};
-struct qoriq_tmu_data;
-
/*
* Thermal zone data
*/
struct qoriq_sensor {
- struct qoriq_tmu_data *qdata;
int id;
};
struct qoriq_tmu_data {
struct qoriq_tmu_regs __iomem *regs;
bool little_endian;
- struct qoriq_sensor *sensor[SITES_MAX];
+ struct qoriq_sensor sensor[SITES_MAX];
};
+static struct qoriq_tmu_data *qoriq_sensor_to_data(struct qoriq_sensor *s)
+{
+ return container_of(s, struct qoriq_tmu_data, sensor[s->id]);
+}
+
static void tmu_write(struct qoriq_tmu_data *p, u32 val, void __iomem *addr)
{
if (p->little_endian)
@@ -94,7 +96,7 @@ static u32 tmu_read(struct qoriq_tmu_data *p, void __iomem *addr)
static int tmu_get_temp(void *p, int *temp)
{
struct qoriq_sensor *qsensor = p;
- struct qoriq_tmu_data *qdata = qsensor->qdata;
+ struct qoriq_tmu_data *qdata = qoriq_sensor_to_data(qsensor);
u32 val;
val = tmu_read(qdata, &qdata->regs->site[qsensor->id].tritsr);
@@ -114,15 +116,9 @@ static int qoriq_tmu_register_tmu_zone(struct platform_device *pdev)
for (id = 0; id < SITES_MAX; id++) {
struct thermal_zone_device *tzd;
- struct qoriq_sensor *s;
-
- s = qdata->sensor[id] = devm_kzalloc(&pdev->dev,
- sizeof(struct qoriq_sensor), GFP_KERNEL);
- if (!qdata->sensor[id])
- return -ENOMEM;
+ struct qoriq_sensor *s = &qdata->sensor[id];
s->id = id;
- s->qdata = qdata;
tzd = devm_thermal_zone_of_sensor_register(&pdev->dev, id,
s, &tmu_tz_ops);
--
2.20.1
next prev parent reply other threads:[~2019-02-22 20:05 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-22 20:04 [PATCH v2 00/13] QorIQ TMU multi-sensor and HWMON support Andrey Smirnov
2019-02-22 20:04 ` [PATCH v2 01/13] thermal_hwmon: Add devres wrapper for thermal_add_hwmon_sysfs() Andrey Smirnov
2019-02-22 20:04 ` [PATCH v2 02/13] thermal: qoriq: Remove unnecessary DT node is NULL check Andrey Smirnov
2019-02-22 20:04 ` [PATCH v2 03/13] thermal: qoriq: Add local struct device pointer Andrey Smirnov
2019-02-22 20:04 ` [PATCH v2 04/13] thermal: qoriq: Don't store struct thermal_zone_device reference Andrey Smirnov
2019-02-22 20:05 ` [PATCH v2 05/13] thermal: qoriq: Add local struct qoriq_sensor pointer Andrey Smirnov
2019-02-22 20:05 ` Andrey Smirnov [this message]
2019-02-22 20:05 ` [PATCH v2 07/13] thermal: qoriq: Pass data to qoriq_tmu_register_tmu_zone() directly Andrey Smirnov
2019-02-22 20:05 ` [PATCH v2 08/13] thermal: qoriq: Pass data to qoriq_tmu_calibration() directly Andrey Smirnov
2019-02-22 20:05 ` [PATCH v2 09/13] thermal: qoriq: Convert driver to use devm_ioremap() Andrey Smirnov
2019-02-22 20:05 ` [PATCH v2 10/13] thermal: qoriq: Convert driver to use regmap API Andrey Smirnov
2019-02-22 20:05 ` [PATCH v2 11/13] thermal: qoriq: Enable all sensors before registering them Andrey Smirnov
2019-02-22 20:05 ` [PATCH v2 12/13] thermal: qoriq: Do not report invalid temperature reading Andrey Smirnov
2019-02-22 20:05 ` [PATCH v2 13/13] thermal: qoriq: Add hwmon support Andrey Smirnov
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=20190222200508.26325-7-andrew.smirnov@gmail.com \
--to=andrew.smirnov@gmail.com \
--cc=cphealy@gmail.com \
--cc=daniel.lezcano@linaro.org \
--cc=edubezval@gmail.com \
--cc=l.stach@pengutronix.de \
--cc=linux-imx@nxp.com \
--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).