Patchwork [v4,04/12] thermal: qoriq: Drop per-sensor data

login
register
mail settings
Submitter Andrey Smirnov
Date April 13, 2019, 8:27 a.m.
Message ID <20190413082748.29990-5-andrew.smirnov@gmail.com>
Download mbox | patch
Permalink /patch/772345/
State New
Headers show

Comments

Andrey Smirnov - April 13, 2019, 8:27 a.m.
Now that driver is converted to use get_temp_id() instead of
get_temp() we no longer need per sensor data. Drop all of the code
related to it.

Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Chris Healy <cphealy@gmail.com>
Cc: Lucas Stach <l.stach@pengutronix.de>
Cc: Eduardo Valentin <edubezval@gmail.com>
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Cc: Angus Ainslie (Purism) <angus@akkea.ca>
Cc: linux-imx@nxp.com
Cc: linux-pm@vger.kernel.org
Cc: linux-kernel@vger.kernel.org
---
 drivers/thermal/qoriq_thermal.c | 25 ++-----------------------
 1 file changed, 2 insertions(+), 23 deletions(-)
Daniel Lezcano - April 16, 2019, 5:23 p.m.
On 13/04/2019 10:27, Andrey Smirnov wrote:
> Now that driver is converted to use get_temp_id() instead of
> get_temp() we no longer need per sensor data. Drop all of the code
> related to it.

Rui, Eduardo,

I just want to point out this patch is depending on:

"[PATCH] thermal/drivers/of: Add a get_temp_id callback function"


> Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
> Cc: Chris Healy <cphealy@gmail.com>
> Cc: Lucas Stach <l.stach@pengutronix.de>
> Cc: Eduardo Valentin <edubezval@gmail.com>
> Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
> Cc: Angus Ainslie (Purism) <angus@akkea.ca>
> Cc: linux-imx@nxp.com
> Cc: linux-pm@vger.kernel.org
> Cc: linux-kernel@vger.kernel.org
> ---
>  drivers/thermal/qoriq_thermal.c | 25 ++-----------------------
>  1 file changed, 2 insertions(+), 23 deletions(-)
> 
> diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c
> index c041d1ae3500..3500e238fe3e 100644
> --- a/drivers/thermal/qoriq_thermal.c
> +++ b/drivers/thermal/qoriq_thermal.c
> @@ -59,20 +59,9 @@ 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];
>  };
>  
>  static void tmu_write(struct qoriq_tmu_data *p, u32 val, void __iomem *addr)
> @@ -93,8 +82,7 @@ static u32 tmu_read(struct qoriq_tmu_data *p, void __iomem *addr)
>  
>  static int tmu_get_temp(int id, void *p, int *temp)
>  {
> -	struct qoriq_sensor *qsensor = p;
> -	struct qoriq_tmu_data *qdata = qsensor->qdata;
> +	struct qoriq_tmu_data *qdata = p;
>  	u32 val;
>  
>  	val = tmu_read(qdata, &qdata->regs->site[id].tritsr);
> @@ -115,17 +103,8 @@ static int qoriq_tmu_register_tmu_zone(struct platform_device *pdev)
>  	for (id = 0; id < SITES_MAX; id++) {
>  		struct thermal_zone_device *tzd;
>  
> -		qdata->sensor[id] = devm_kzalloc(&pdev->dev,
> -				sizeof(struct qoriq_sensor), GFP_KERNEL);
> -		if (!qdata->sensor[id])
> -			return -ENOMEM;
> -
> -		qdata->sensor[id]->id = id;
> -		qdata->sensor[id]->qdata = qdata;
> -
>  		tzd = devm_thermal_zone_of_sensor_register(&pdev->dev, id,
> -							   qdata->sensor[id],
> -							   &tmu_tz_ops);
> +							   qdata, &tmu_tz_ops);
>  		if (IS_ERR(tzd)) {
>  			if (PTR_ERR(tzd) == -ENODEV)
>  				continue;
>

Patch

diff --git a/drivers/thermal/qoriq_thermal.c b/drivers/thermal/qoriq_thermal.c
index c041d1ae3500..3500e238fe3e 100644
--- a/drivers/thermal/qoriq_thermal.c
+++ b/drivers/thermal/qoriq_thermal.c
@@ -59,20 +59,9 @@  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];
 };
 
 static void tmu_write(struct qoriq_tmu_data *p, u32 val, void __iomem *addr)
@@ -93,8 +82,7 @@  static u32 tmu_read(struct qoriq_tmu_data *p, void __iomem *addr)
 
 static int tmu_get_temp(int id, void *p, int *temp)
 {
-	struct qoriq_sensor *qsensor = p;
-	struct qoriq_tmu_data *qdata = qsensor->qdata;
+	struct qoriq_tmu_data *qdata = p;
 	u32 val;
 
 	val = tmu_read(qdata, &qdata->regs->site[id].tritsr);
@@ -115,17 +103,8 @@  static int qoriq_tmu_register_tmu_zone(struct platform_device *pdev)
 	for (id = 0; id < SITES_MAX; id++) {
 		struct thermal_zone_device *tzd;
 
-		qdata->sensor[id] = devm_kzalloc(&pdev->dev,
-				sizeof(struct qoriq_sensor), GFP_KERNEL);
-		if (!qdata->sensor[id])
-			return -ENOMEM;
-
-		qdata->sensor[id]->id = id;
-		qdata->sensor[id]->qdata = qdata;
-
 		tzd = devm_thermal_zone_of_sensor_register(&pdev->dev, id,
-							   qdata->sensor[id],
-							   &tmu_tz_ops);
+							   qdata, &tmu_tz_ops);
 		if (IS_ERR(tzd)) {
 			if (PTR_ERR(tzd) == -ENODEV)
 				continue;