Re: [PATCH 10/13] thermal/drivers/hisi: Rename and remove unused field

[Leo Yan]

On Wed, Aug 30, 2017 at 10:47:34AM +0200, Daniel Lezcano wrote:
> Rename the 'sensors' field to 'sensor' as we describe only one sensor.
> Remove the 'sensor_temp' as it is no longer used.
> 
> Signed-off-by: Daniel Lezcano 

Reviewed-by: Leo Yan 
Tested-by: Leo Yan 

> ---
>  drivers/thermal/hisi_thermal.c | 18 --
>  1 file changed, 8 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c
> index b038d8a..68b625c 100644
> --- a/drivers/thermal/hisi_thermal.c
> +++ b/drivers/thermal/hisi_thermal.c
> @@ -47,8 +47,6 @@
>  struct hisi_thermal_sensor {
>   struct hisi_thermal_data *thermal;
>   struct thermal_zone_device *tzd;
> -
> - long sensor_temp;
>   uint32_t id;
>   uint32_t thres_temp;
>  };
> @@ -57,9 +55,9 @@ struct hisi_thermal_data {
>   struct mutex thermal_lock;/* protects register data */
>   struct platform_device *pdev;
>   struct clk *clk;
> - struct hisi_thermal_sensor sensors;
> - int irq;
> + struct hisi_thermal_sensor sensor;
>   void __iomem *regs;
> + int irq;
>  };
>  
>  /*
> @@ -229,7 +227,7 @@ static const struct thermal_zone_of_device_ops 
> hisi_of_thermal_ops = {
>  static irqreturn_t hisi_thermal_alarm_irq_thread(int irq, void *dev)
>  {
>   struct hisi_thermal_data *data = dev;
> - struct hisi_thermal_sensor *sensor = >sensors;
> + struct hisi_thermal_sensor *sensor = >sensor;
>   int temp;
>  
>   hisi_thermal_alarm_clear(data->regs, 1);
> @@ -240,7 +238,7 @@ static irqreturn_t hisi_thermal_alarm_irq_thread(int irq, 
> void *dev)
>   dev_crit(>pdev->dev, "THERMAL ALARM: %d > %d\n",
>temp, sensor->thres_temp);
>  
> - thermal_zone_device_update(data->sensors.tzd,
> + thermal_zone_device_update(data->sensor.tzd,
>  THERMAL_EVENT_UNSPECIFIED);
>  
>   } else if (temp < sensor->thres_temp) {
> @@ -303,7 +301,7 @@ static int hisi_thermal_setup(struct hisi_thermal_data 
> *data)
>  {
>   struct hisi_thermal_sensor *sensor;
>  
> - sensor = >sensors;
> + sensor = >sensor;
>  
>   /* disable module firstly */
>   hisi_thermal_reset_enable(data->regs, 0);
> @@ -376,7 +374,7 @@ static int hisi_thermal_probe(struct platform_device 
> *pdev)
>   }
>  
>   ret = hisi_thermal_register_sensor(pdev, data,
> ->sensors,
> +>sensor,
>  HISI_DEFAULT_SENSOR);
>   if (ret) {
>   dev_err(>dev, "failed to register thermal sensor: %d\n",
> @@ -398,7 +396,7 @@ static int hisi_thermal_probe(struct platform_device 
> *pdev)
>   return ret;
>   }
>  
> - hisi_thermal_toggle_sensor(>sensors, true);
> + hisi_thermal_toggle_sensor(>sensor, true);
>  
>   return 0;
>  }
> @@ -406,7 +404,7 @@ static int hisi_thermal_probe(struct platform_device 
> *pdev)
>  static int hisi_thermal_remove(struct platform_device *pdev)
>  {
>   struct hisi_thermal_data *data = platform_get_drvdata(pdev);
> - struct hisi_thermal_sensor *sensor = >sensors;
> + struct hisi_thermal_sensor *sensor = >sensor;
>  
>   hisi_thermal_toggle_sensor(sensor, false);
>   hisi_thermal_disable_sensor(data);
> -- 
> 2.7.4
> 

Re: [PATCH 10/13] thermal/drivers/hisi: Rename and remove unused field

[Leo Yan]

On Wed, Aug 30, 2017 at 10:47:34AM +0200, Daniel Lezcano wrote:
> Rename the 'sensors' field to 'sensor' as we describe only one sensor.
> Remove the 'sensor_temp' as it is no longer used.
> 
> Signed-off-by: Daniel Lezcano 

Reviewed-by: Leo Yan 
Tested-by: Leo Yan 

> ---
>  drivers/thermal/hisi_thermal.c | 18 --
>  1 file changed, 8 insertions(+), 10 deletions(-)
> 
> diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c
> index b038d8a..68b625c 100644
> --- a/drivers/thermal/hisi_thermal.c
> +++ b/drivers/thermal/hisi_thermal.c
> @@ -47,8 +47,6 @@
>  struct hisi_thermal_sensor {
>   struct hisi_thermal_data *thermal;
>   struct thermal_zone_device *tzd;
> -
> - long sensor_temp;
>   uint32_t id;
>   uint32_t thres_temp;
>  };
> @@ -57,9 +55,9 @@ struct hisi_thermal_data {
>   struct mutex thermal_lock;/* protects register data */
>   struct platform_device *pdev;
>   struct clk *clk;
> - struct hisi_thermal_sensor sensors;
> - int irq;
> + struct hisi_thermal_sensor sensor;
>   void __iomem *regs;
> + int irq;
>  };
>  
>  /*
> @@ -229,7 +227,7 @@ static const struct thermal_zone_of_device_ops 
> hisi_of_thermal_ops = {
>  static irqreturn_t hisi_thermal_alarm_irq_thread(int irq, void *dev)
>  {
>   struct hisi_thermal_data *data = dev;
> - struct hisi_thermal_sensor *sensor = >sensors;
> + struct hisi_thermal_sensor *sensor = >sensor;
>   int temp;
>  
>   hisi_thermal_alarm_clear(data->regs, 1);
> @@ -240,7 +238,7 @@ static irqreturn_t hisi_thermal_alarm_irq_thread(int irq, 
> void *dev)
>   dev_crit(>pdev->dev, "THERMAL ALARM: %d > %d\n",
>temp, sensor->thres_temp);
>  
> - thermal_zone_device_update(data->sensors.tzd,
> + thermal_zone_device_update(data->sensor.tzd,
>  THERMAL_EVENT_UNSPECIFIED);
>  
>   } else if (temp < sensor->thres_temp) {
> @@ -303,7 +301,7 @@ static int hisi_thermal_setup(struct hisi_thermal_data 
> *data)
>  {
>   struct hisi_thermal_sensor *sensor;
>  
> - sensor = >sensors;
> + sensor = >sensor;
>  
>   /* disable module firstly */
>   hisi_thermal_reset_enable(data->regs, 0);
> @@ -376,7 +374,7 @@ static int hisi_thermal_probe(struct platform_device 
> *pdev)
>   }
>  
>   ret = hisi_thermal_register_sensor(pdev, data,
> ->sensors,
> +>sensor,
>  HISI_DEFAULT_SENSOR);
>   if (ret) {
>   dev_err(>dev, "failed to register thermal sensor: %d\n",
> @@ -398,7 +396,7 @@ static int hisi_thermal_probe(struct platform_device 
> *pdev)
>   return ret;
>   }
>  
> - hisi_thermal_toggle_sensor(>sensors, true);
> + hisi_thermal_toggle_sensor(>sensor, true);
>  
>   return 0;
>  }
> @@ -406,7 +404,7 @@ static int hisi_thermal_probe(struct platform_device 
> *pdev)
>  static int hisi_thermal_remove(struct platform_device *pdev)
>  {
>   struct hisi_thermal_data *data = platform_get_drvdata(pdev);
> - struct hisi_thermal_sensor *sensor = >sensors;
> + struct hisi_thermal_sensor *sensor = >sensor;
>  
>   hisi_thermal_toggle_sensor(sensor, false);
>   hisi_thermal_disable_sensor(data);
> -- 
> 2.7.4
> 

[PATCH 10/13] thermal/drivers/hisi: Rename and remove unused field

[Daniel Lezcano]

Rename the 'sensors' field to 'sensor' as we describe only one sensor.
Remove the 'sensor_temp' as it is no longer used.

Signed-off-by: Daniel Lezcano 
---
 drivers/thermal/hisi_thermal.c | 18 --
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c
index b038d8a..68b625c 100644
--- a/drivers/thermal/hisi_thermal.c
+++ b/drivers/thermal/hisi_thermal.c
@@ -47,8 +47,6 @@
 struct hisi_thermal_sensor {
struct hisi_thermal_data *thermal;
struct thermal_zone_device *tzd;
-
-   long sensor_temp;
uint32_t id;
uint32_t thres_temp;
 };
@@ -57,9 +55,9 @@ struct hisi_thermal_data {
struct mutex thermal_lock;/* protects register data */
struct platform_device *pdev;
struct clk *clk;
-   struct hisi_thermal_sensor sensors;
-   int irq;
+   struct hisi_thermal_sensor sensor;
void __iomem *regs;
+   int irq;
 };
 
 /*
@@ -229,7 +227,7 @@ static const struct thermal_zone_of_device_ops 
hisi_of_thermal_ops = {
 static irqreturn_t hisi_thermal_alarm_irq_thread(int irq, void *dev)
 {
struct hisi_thermal_data *data = dev;
-   struct hisi_thermal_sensor *sensor = >sensors;
+   struct hisi_thermal_sensor *sensor = >sensor;
int temp;
 
hisi_thermal_alarm_clear(data->regs, 1);
@@ -240,7 +238,7 @@ static irqreturn_t hisi_thermal_alarm_irq_thread(int irq, 
void *dev)
dev_crit(>pdev->dev, "THERMAL ALARM: %d > %d\n",
 temp, sensor->thres_temp);
 
-   thermal_zone_device_update(data->sensors.tzd,
+   thermal_zone_device_update(data->sensor.tzd,
   THERMAL_EVENT_UNSPECIFIED);
 
} else if (temp < sensor->thres_temp) {
@@ -303,7 +301,7 @@ static int hisi_thermal_setup(struct hisi_thermal_data 
*data)
 {
struct hisi_thermal_sensor *sensor;
 
-   sensor = >sensors;
+   sensor = >sensor;
 
/* disable module firstly */
hisi_thermal_reset_enable(data->regs, 0);
@@ -376,7 +374,7 @@ static int hisi_thermal_probe(struct platform_device *pdev)
}
 
ret = hisi_thermal_register_sensor(pdev, data,
-  >sensors,
+  >sensor,
   HISI_DEFAULT_SENSOR);
if (ret) {
dev_err(>dev, "failed to register thermal sensor: %d\n",
@@ -398,7 +396,7 @@ static int hisi_thermal_probe(struct platform_device *pdev)
return ret;
}
 
-   hisi_thermal_toggle_sensor(>sensors, true);
+   hisi_thermal_toggle_sensor(>sensor, true);
 
return 0;
 }
@@ -406,7 +404,7 @@ static int hisi_thermal_probe(struct platform_device *pdev)
 static int hisi_thermal_remove(struct platform_device *pdev)
 {
struct hisi_thermal_data *data = platform_get_drvdata(pdev);
-   struct hisi_thermal_sensor *sensor = >sensors;
+   struct hisi_thermal_sensor *sensor = >sensor;
 
hisi_thermal_toggle_sensor(sensor, false);
hisi_thermal_disable_sensor(data);
-- 
2.7.4

[PATCH 10/13] thermal/drivers/hisi: Rename and remove unused field

[Daniel Lezcano]

Rename the 'sensors' field to 'sensor' as we describe only one sensor.
Remove the 'sensor_temp' as it is no longer used.

Signed-off-by: Daniel Lezcano 
---
 drivers/thermal/hisi_thermal.c | 18 --
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/drivers/thermal/hisi_thermal.c b/drivers/thermal/hisi_thermal.c
index b038d8a..68b625c 100644
--- a/drivers/thermal/hisi_thermal.c
+++ b/drivers/thermal/hisi_thermal.c
@@ -47,8 +47,6 @@
 struct hisi_thermal_sensor {
struct hisi_thermal_data *thermal;
struct thermal_zone_device *tzd;
-
-   long sensor_temp;
uint32_t id;
uint32_t thres_temp;
 };
@@ -57,9 +55,9 @@ struct hisi_thermal_data {
struct mutex thermal_lock;/* protects register data */
struct platform_device *pdev;
struct clk *clk;
-   struct hisi_thermal_sensor sensors;
-   int irq;
+   struct hisi_thermal_sensor sensor;
void __iomem *regs;
+   int irq;
 };
 
 /*
@@ -229,7 +227,7 @@ static const struct thermal_zone_of_device_ops 
hisi_of_thermal_ops = {
 static irqreturn_t hisi_thermal_alarm_irq_thread(int irq, void *dev)
 {
struct hisi_thermal_data *data = dev;
-   struct hisi_thermal_sensor *sensor = >sensors;
+   struct hisi_thermal_sensor *sensor = >sensor;
int temp;
 
hisi_thermal_alarm_clear(data->regs, 1);
@@ -240,7 +238,7 @@ static irqreturn_t hisi_thermal_alarm_irq_thread(int irq, 
void *dev)
dev_crit(>pdev->dev, "THERMAL ALARM: %d > %d\n",
 temp, sensor->thres_temp);
 
-   thermal_zone_device_update(data->sensors.tzd,
+   thermal_zone_device_update(data->sensor.tzd,
   THERMAL_EVENT_UNSPECIFIED);
 
} else if (temp < sensor->thres_temp) {
@@ -303,7 +301,7 @@ static int hisi_thermal_setup(struct hisi_thermal_data 
*data)
 {
struct hisi_thermal_sensor *sensor;
 
-   sensor = >sensors;
+   sensor = >sensor;
 
/* disable module firstly */
hisi_thermal_reset_enable(data->regs, 0);
@@ -376,7 +374,7 @@ static int hisi_thermal_probe(struct platform_device *pdev)
}
 
ret = hisi_thermal_register_sensor(pdev, data,
-  >sensors,
+  >sensor,
   HISI_DEFAULT_SENSOR);
if (ret) {
dev_err(>dev, "failed to register thermal sensor: %d\n",
@@ -398,7 +396,7 @@ static int hisi_thermal_probe(struct platform_device *pdev)
return ret;
}
 
-   hisi_thermal_toggle_sensor(>sensors, true);
+   hisi_thermal_toggle_sensor(>sensor, true);
 
return 0;
 }
@@ -406,7 +404,7 @@ static int hisi_thermal_probe(struct platform_device *pdev)
 static int hisi_thermal_remove(struct platform_device *pdev)
 {
struct hisi_thermal_data *data = platform_get_drvdata(pdev);
-   struct hisi_thermal_sensor *sensor = >sensors;
+   struct hisi_thermal_sensor *sensor = >sensor;
 
hisi_thermal_toggle_sensor(sensor, false);
hisi_thermal_disable_sensor(data);
-- 
2.7.4