2021-11-22 15:56:47

by Geert Uytterhoeven

Subject: [PATCH/RFC 08/17] iio: humidity: hts221: Use bitfield helpers

Use the field_prep() helper, instead of open-coding the same operation.

Signed-off-by: Geert Uytterhoeven <[email protected]>
---
Compile-tested only.
Marked RFC, as this depends on [PATCH 01/17], but follows a different
path to upstream.
---
drivers/iio/humidity/hts221_core.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/iio/humidity/hts221_core.c b/drivers/iio/humidity/hts221_core.c
index 6a39615b696114cd..749aedc469ede5c1 100644
--- a/drivers/iio/humidity/hts221_core.c
+++ b/drivers/iio/humidity/hts221_core.c
@@ -7,6 +7,7 @@
* Lorenzo Bianconi <[email protected]>
*/

+#include <linux/bitfield.h>
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/device.h>
@@ -171,7 +172,7 @@ static int hts221_update_avg(struct hts221_hw *hw,
u16 val)
{
const struct hts221_avg *avg = &hts221_avg_list[type];
- int i, err, data;
+ int i, err;

for (i = 0; i < HTS221_AVG_DEPTH; i++)
if (avg->avg_avl[i] == val)
@@ -180,9 +181,8 @@ static int hts221_update_avg(struct hts221_hw *hw,
if (i == HTS221_AVG_DEPTH)
return -EINVAL;

- data = ((i << __ffs(avg->mask)) & avg->mask);
- err = regmap_update_bits(hw->regmap, avg->addr,
- avg->mask, data);
+ err = regmap_update_bits(hw->regmap, avg->addr, avg->mask,
+ field_prep(avg->mask, i));
if (err < 0)
return err;

--
2.25.1

2021-11-24 15:21:24

by Jonathan Cameron

Subject: Re: [PATCH/RFC 08/17] iio: humidity: hts221: Use bitfield helpers

On Mon, 22 Nov 2021 16:54:01 +0100
Geert Uytterhoeven <[email protected]> wrote:

> Use the field_prep() helper, instead of open-coding the same operation.
>
> Signed-off-by: Geert Uytterhoeven <[email protected]>
Hi Geert,

If this should got forwards, looks like a nice cleanup for the two IIO
ones, so I'll be happy to pick them up once infrastructure in place
(ideally have the infrastructure an immutable branch to save having
to revisit in 3+ months time!)

Jonathan

> ---
> Compile-tested only.
> Marked RFC, as this depends on [PATCH 01/17], but follows a different
> path to upstream.
> ---
> drivers/iio/humidity/hts221_core.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/iio/humidity/hts221_core.c b/drivers/iio/humidity/hts221_core.c
> index 6a39615b696114cd..749aedc469ede5c1 100644
> --- a/drivers/iio/humidity/hts221_core.c
> +++ b/drivers/iio/humidity/hts221_core.c
> @@ -7,6 +7,7 @@
> * Lorenzo Bianconi <[email protected]>
> */
>
> +#include <linux/bitfield.h>
> #include <linux/kernel.h>
> #include <linux/module.h>
> #include <linux/device.h>
> @@ -171,7 +172,7 @@ static int hts221_update_avg(struct hts221_hw *hw,
> u16 val)
> {
> const struct hts221_avg *avg = &hts221_avg_list[type];
> - int i, err, data;
> + int i, err;
>
> for (i = 0; i < HTS221_AVG_DEPTH; i++)
> if (avg->avg_avl[i] == val)
> @@ -180,9 +181,8 @@ static int hts221_update_avg(struct hts221_hw *hw,
> if (i == HTS221_AVG_DEPTH)
> return -EINVAL;
>
> - data = ((i << __ffs(avg->mask)) & avg->mask);
> - err = regmap_update_bits(hw->regmap, avg->addr,
> - avg->mask, data);
> + err = regmap_update_bits(hw->regmap, avg->addr, avg->mask,
> + field_prep(avg->mask, i));
> if (err < 0)
> return err;
>