2020-11-09 11:49:20

by Frank Lee

[permalink] [raw]

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

---

From: Yangtao Li <[email protected]>

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 <[email protected]>
---
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 <[email protected]>
*/

+#include <linux/bitmap.h>
#include <linux/clk.h>
#include <linux/device.h>
#include <linux/interrupt.h>
@@ -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, &state);

@@ -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(&irq_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, &state);

@@ -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(&irq_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, &irq_bitmap, tmdev->chip->sensor_num) {
+ thermal_zone_device_update(tmdev->sensor[i].tzd,
+ THERMAL_EVENT_UNSPECIFIED);
}

return IRQ_HANDLED;
--
2.28.0

2020-11-10 09:59:43

by Maxime Ripard

[permalink] [raw]

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

---

On Mon, Nov 09, 2020 at 07:46:24PM +0800, Frank Lee wrote:
> From: Yangtao Li <[email protected]>
>
> 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 <[email protected]>

Acked-by: Maxime Ripard <[email protected]>

Thanks!
Maxime

---

Attachments:

(No filename) (396.00 B)
signature.asc (235.00 B)
Download all attachments

2020-11-12 10:27:34

by Daniel Lezcano

[permalink] [raw]

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

---

On 09/11/2020 12:46, Frank Lee wrote:
> From: Yangtao Li <[email protected]>
>
> 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 <[email protected]>
> ---
> v2:
> Make irq_ack to return an unsigned long
> ---

Applied, thanks

--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog