| Message ID | 20240429113313.68359-4-wsa+renesas@sang-engineering.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | iio: use 'time_left' instead of 'timeout' with wait_for_*() functions | expand |
> Subject: [PATCH 3/8] iio: adc: fsl-imx25-gcq: use 'time_left' variable with > wait_for_completion_interruptible_timeout() > > There is a confusing pattern in the kernel to use a variable named 'timeout' to > store the result of wait_for_completion_interruptible_timeout() causing > patterns like: > > timeout = wait_for_completion_interruptible_timeout(...) > if (!timeout) return -ETIMEDOUT; > > with all kinds of permutations. Use 'time_left' as a variable to make the code > self explaining. > > Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> Reviewed-by: Peng Fan <peng.fan@nxp.com> > --- > drivers/iio/adc/fsl-imx25-gcq.c | 10 +++++----- > 1 file changed, 5 insertions(+), 5 deletions(-) > > diff --git a/drivers/iio/adc/fsl-imx25-gcq.c b/drivers/iio/adc/fsl-imx25-gcq.c > index 68c813de0605..dabc5303d644 100644 > --- a/drivers/iio/adc/fsl-imx25-gcq.c > +++ b/drivers/iio/adc/fsl-imx25-gcq.c > @@ -107,7 +107,7 @@ static int mx25_gcq_get_raw_value(struct device > *dev, > struct mx25_gcq_priv *priv, > int *val) > { > - long timeout; > + long time_left; > u32 data; > > /* Setup the configuration we want to use */ @@ -120,12 +120,12 > @@ static int mx25_gcq_get_raw_value(struct device *dev, > regmap_update_bits(priv->regs, MX25_ADCQ_CR, > MX25_ADCQ_CR_FQS, > MX25_ADCQ_CR_FQS); > > - timeout = wait_for_completion_interruptible_timeout( > + time_left = wait_for_completion_interruptible_timeout( > &priv->completed, MX25_GCQ_TIMEOUT); > - if (timeout < 0) { > + if (time_left < 0) { > dev_err(dev, "ADC wait for measurement failed\n"); > - return timeout; > - } else if (timeout == 0) { > + return time_left; > + } else if (time_left == 0) { > dev_err(dev, "ADC timed out\n"); > return -ETIMEDOUT; > } > -- > 2.43.0 >
diff --git a/drivers/iio/adc/fsl-imx25-gcq.c b/drivers/iio/adc/fsl-imx25-gcq.c index 68c813de0605..dabc5303d644 100644 --- a/drivers/iio/adc/fsl-imx25-gcq.c +++ b/drivers/iio/adc/fsl-imx25-gcq.c @@ -107,7 +107,7 @@ static int mx25_gcq_get_raw_value(struct device *dev, struct mx25_gcq_priv *priv, int *val) { - long timeout; + long time_left; u32 data; /* Setup the configuration we want to use */ @@ -120,12 +120,12 @@ static int mx25_gcq_get_raw_value(struct device *dev, regmap_update_bits(priv->regs, MX25_ADCQ_CR, MX25_ADCQ_CR_FQS, MX25_ADCQ_CR_FQS); - timeout = wait_for_completion_interruptible_timeout( + time_left = wait_for_completion_interruptible_timeout( &priv->completed, MX25_GCQ_TIMEOUT); - if (timeout < 0) { + if (time_left < 0) { dev_err(dev, "ADC wait for measurement failed\n"); - return timeout; - } else if (timeout == 0) { + return time_left; + } else if (time_left == 0) { dev_err(dev, "ADC timed out\n"); return -ETIMEDOUT; }
There is a confusing pattern in the kernel to use a variable named 'timeout' to store the result of wait_for_completion_interruptible_timeout() causing patterns like: timeout = wait_for_completion_interruptible_timeout(...) if (!timeout) return -ETIMEDOUT; with all kinds of permutations. Use 'time_left' as a variable to make the code self explaining. Signed-off-by: Wolfram Sang <wsa+renesas@sang-engineering.com> --- drivers/iio/adc/fsl-imx25-gcq.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)