diff mbox series

[v6,3/5] iio:temperature:mlx90632: Convert polling while loop to regmap

Message ID 20200818213737.140613-4-cmo@melexis.com
State New
Headers show
Series iio: temperature: mlx90632: Add extended calibration calculations | expand

Commit Message

Crt Mori Aug. 18, 2020, 9:37 p.m. UTC
Reduce number of lines and improve readability to convert polling while
loops to regmap_read_poll_timeout.

Signed-off-by: Crt Mori <cmo@melexis.com>
---
 drivers/iio/temperature/mlx90632.c | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

Comments

Andy Shevchenko Aug. 19, 2020, 8:08 a.m. UTC | #1
On Wed, Aug 19, 2020 at 12:38 AM Crt Mori <cmo@melexis.com> wrote:
>
> Reduce number of lines and improve readability to convert polling while
> loops to regmap_read_poll_timeout.

Usually we refer to a function as regmap_read_poll_timeout(). Note
parentheses. I think Jonathan can fix when applying, no need to
resend.

Precisely what I meant, thanks!
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>

> Signed-off-by: Crt Mori <cmo@melexis.com>
> ---
>  drivers/iio/temperature/mlx90632.c | 16 +++++-----------
>  1 file changed, 5 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/iio/temperature/mlx90632.c b/drivers/iio/temperature/mlx90632.c
> index ce75f5a3486b..d782634c107f 100644
> --- a/drivers/iio/temperature/mlx90632.c
> +++ b/drivers/iio/temperature/mlx90632.c
> @@ -180,25 +180,19 @@ static s32 mlx90632_pwr_continuous(struct regmap *regmap)
>   */
>  static int mlx90632_perform_measurement(struct mlx90632_data *data)
>  {
> -       int ret, tries = 100;
>         unsigned int reg_status;
> +       int ret;
>
>         ret = regmap_update_bits(data->regmap, MLX90632_REG_STATUS,
>                                  MLX90632_STAT_DATA_RDY, 0);
>         if (ret < 0)
>                 return ret;
>
> -       while (tries-- > 0) {
> -               ret = regmap_read(data->regmap, MLX90632_REG_STATUS,
> -                                 &reg_status);
> -               if (ret < 0)
> -                       return ret;
> -               if (reg_status & MLX90632_STAT_DATA_RDY)
> -                       break;
> -               usleep_range(10000, 11000);
> -       }
> +       ret = regmap_read_poll_timeout(data->regmap, MLX90632_REG_STATUS, reg_status,
> +                                      !(reg_status & MLX90632_STAT_DATA_RDY), 10000,
> +                                      100 * 10000);
>
> -       if (tries < 0) {
> +       if (ret < 0) {
>                 dev_err(&data->client->dev, "data not ready");
>                 return -ETIMEDOUT;
>         }
> --
> 2.25.1
>


--
With Best Regards,
Andy Shevchenko
diff mbox series

Patch

diff --git a/drivers/iio/temperature/mlx90632.c b/drivers/iio/temperature/mlx90632.c
index ce75f5a3486b..d782634c107f 100644
--- a/drivers/iio/temperature/mlx90632.c
+++ b/drivers/iio/temperature/mlx90632.c
@@ -180,25 +180,19 @@  static s32 mlx90632_pwr_continuous(struct regmap *regmap)
  */
 static int mlx90632_perform_measurement(struct mlx90632_data *data)
 {
-	int ret, tries = 100;
 	unsigned int reg_status;
+	int ret;
 
 	ret = regmap_update_bits(data->regmap, MLX90632_REG_STATUS,
 				 MLX90632_STAT_DATA_RDY, 0);
 	if (ret < 0)
 		return ret;
 
-	while (tries-- > 0) {
-		ret = regmap_read(data->regmap, MLX90632_REG_STATUS,
-				  &reg_status);
-		if (ret < 0)
-			return ret;
-		if (reg_status & MLX90632_STAT_DATA_RDY)
-			break;
-		usleep_range(10000, 11000);
-	}
+	ret = regmap_read_poll_timeout(data->regmap, MLX90632_REG_STATUS, reg_status,
+				       !(reg_status & MLX90632_STAT_DATA_RDY), 10000,
+				       100 * 10000);
 
-	if (tries < 0) {
+	if (ret < 0) {
 		dev_err(&data->client->dev, "data not ready");
 		return -ETIMEDOUT;
 	}