Re: [PATCH v2] thermal: sun8i: Use bitmap API instead of open code

[Daniel Lezcano]

On 09/11/2020 12:46, Frank Lee wrote:
> From: Yangtao Li 
> 
> The bitmap_* API is the standard way to access data in the bitfield.
> So convert irq_ack to return an unsigned long, and make things to use
> bitmap API.
> 
> Signed-off-by: Yangtao Li 
> ---
> v2:
> Make irq_ack to return an unsigned long
> ---

Applied, thanks

-- 
 Linaro.org │ Open source software for ARM SoCs

Follow Linaro:   Facebook |
 Twitter |
 Blog

Re: [PATCH v2] thermal: sun8i: Use bitmap API instead of open code

[Maxime Ripard]

On Mon, Nov 09, 2020 at 07:46:24PM +0800, Frank Lee wrote:
> From: Yangtao Li 
> 
> The bitmap_* API is the standard way to access data in the bitfield.
> So convert irq_ack to return an unsigned long, and make things to use
> bitmap API.
> 
> Signed-off-by: Yangtao Li 

Acked-by: Maxime Ripard 

Thanks!
Maxime


signature.asc
Description: PGP signature

[PATCH v2] thermal: sun8i: Use bitmap API instead of open code

[Frank Lee]

From: Yangtao Li 

The bitmap_* API is the standard way to access data in the bitfield.
So convert irq_ack to return an unsigned long, and make things to use
bitmap API.

Signed-off-by: Yangtao Li 
---
v2:
Make irq_ack to return an unsigned long
---
 drivers/thermal/sun8i_thermal.c | 33 +
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/drivers/thermal/sun8i_thermal.c b/drivers/thermal/sun8i_thermal.c
index f8b13071a6f4..8c80bd06dd9f 100644
--- a/drivers/thermal/sun8i_thermal.c
+++ b/drivers/thermal/sun8i_thermal.c
@@ -8,6 +8,7 @@
  * Based on the work of Josef Gajdusek 
  */
 
+#include 
 #include 
 #include 
 #include 
@@ -74,7 +75,7 @@ struct ths_thermal_chip {
int (*calibrate)(struct ths_device *tmdev,
 u16 *caldata, int callen);
int (*init)(struct ths_device *tmdev);
-   int (*irq_ack)(struct ths_device *tmdev);
+   unsigned long   (*irq_ack)(struct ths_device *tmdev);
int (*calc_temp)(struct ths_device *tmdev,
 int id, int reg);
 };
@@ -146,9 +147,10 @@ static const struct regmap_config config = {
.max_register = 0xfc,
 };
 
-static int sun8i_h3_irq_ack(struct ths_device *tmdev)
+static unsigned long sun8i_h3_irq_ack(struct ths_device *tmdev)
 {
-   int i, state, ret = 0;
+   unsigned long irq_bitmap = 0;
+   int i, state;
 
regmap_read(tmdev->regmap, SUN8I_THS_IS, );
 
@@ -156,16 +158,17 @@ static int sun8i_h3_irq_ack(struct ths_device *tmdev)
if (state & SUN8I_THS_DATA_IRQ_STS(i)) {
regmap_write(tmdev->regmap, SUN8I_THS_IS,
 SUN8I_THS_DATA_IRQ_STS(i));
-   ret |= BIT(i);
+   bitmap_set(_bitmap, i, 1);
}
}
 
-   return ret;
+   return irq_bitmap;
 }
 
-static int sun50i_h6_irq_ack(struct ths_device *tmdev)
+static unsigned long sun50i_h6_irq_ack(struct ths_device *tmdev)
 {
-   int i, state, ret = 0;
+   unsigned long irq_bitmap = 0;
+   int i, state;
 
regmap_read(tmdev->regmap, SUN50I_H6_THS_DIS, );
 
@@ -173,24 +176,22 @@ static int sun50i_h6_irq_ack(struct ths_device *tmdev)
if (state & SUN50I_H6_THS_DATA_IRQ_STS(i)) {
regmap_write(tmdev->regmap, SUN50I_H6_THS_DIS,
 SUN50I_H6_THS_DATA_IRQ_STS(i));
-   ret |= BIT(i);
+   bitmap_set(_bitmap, i, 1);
}
}
 
-   return ret;
+   return irq_bitmap;
 }
 
 static irqreturn_t sun8i_irq_thread(int irq, void *data)
 {
struct ths_device *tmdev = data;
-   int i, state;
-
-   state = tmdev->chip->irq_ack(tmdev);
+   unsigned long irq_bitmap = tmdev->chip->irq_ack(tmdev);
+   int i;
 
-   for (i = 0; i < tmdev->chip->sensor_num; i++) {
-   if (state & BIT(i))
-   thermal_zone_device_update(tmdev->sensor[i].tzd,
-  THERMAL_EVENT_UNSPECIFIED);
+   for_each_set_bit(i, _bitmap, tmdev->chip->sensor_num) {
+   thermal_zone_device_update(tmdev->sensor[i].tzd,
+  THERMAL_EVENT_UNSPECIFIED);
}
 
return IRQ_HANDLED;
-- 
2.28.0