Commit 611343d9 authored by Andrey Smirnov's avatar Andrey Smirnov Committed by Angus Ainslie (Purism)

thermal: qoriq: Embed per-sensor data into struct qoriq_tmu_data

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: default avatarAndrey Smirnov <>
Cc: Chris Healy <>
Cc: Lucas Stach <>
Cc: Zhang Rui <>
Cc: Eduardo Valentin <>
Cc: Daniel Lezcano <>
parent 3baa01ef
......@@ -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);
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment