Re: [PATCH] msi3103: Use time_before_eq()

[Antti Palosaari]

Acked-by: Antti Palosaari <crope@xxxxxx>
Reviewed-by: Antti Palosaari <crope@xxxxxx>

Mauro, pick that from patchwork to 3.16. I am not going to PULL request it.

regards
Antti


On 05/25/2014 03:39 PM, Manuel SchÃlling wrote:
> To be future-proof and for better readability the time comparisons are
> modified to use time_before_eq() instead of plain, error-prone math.
>
> Signed-off-by: Manuel SchÃlling <manuel.schoelling@xxxxxx>
> ---
>   drivers/staging/media/msi3101/sdr-msi3101.c |   28 +++++++++++++--------------
>   1 file changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/staging/media/msi3101/sdr-msi3101.c b/drivers/staging/media/msi3101/sdr-msi3101.c
> index 65d351f..7a0a8ca 100644
> --- a/drivers/staging/media/msi3101/sdr-msi3101.c
> +++ b/drivers/staging/media/msi3101/sdr-msi3101.c
> @@ -207,10 +207,10 @@ static int msi3101_convert_stream_504(struct msi3101_state *s, u8 *dst,
>   		dst_len += 1008;
>   	}
>
> -	/* calculate samping rate and output it in 10 seconds intervals */
> -	if ((s->jiffies_next + msecs_to_jiffies(10000)) <= jiffies) {
> +	/* calculate sampling rate and output it in 10 seconds intervals */
> +	if (time_before_eq(s->jiffies_next + 10 * HZ, jiffies)) {
>   		unsigned long jiffies_now = jiffies;
> -		unsigned long msecs = jiffies_to_msecs(jiffies_now) - jiffies_to_msecs(s->jiffies_next);
> +		unsigned long msecs = jiffies_to_msecs(jiffies_now - s->jiffies_next);
>   		unsigned int samples = sample_num[i_max - 1] - s->sample;
>   		s->jiffies_next = jiffies_now;
>   		s->sample = sample_num[i_max - 1];
> @@ -265,7 +265,7 @@ static int msi3101_convert_stream_504_u8(struct msi3101_state *s, u8 *dst,
>   		dst_len += 1008;
>   	}
>
> -	/* calculate samping rate and output it in 10 seconds intervals */
> +	/* calculate sampling rate and output it in 10 seconds intervals */
>   	if (unlikely(time_is_before_jiffies(s->jiffies_next))) {
>   #define MSECS 10000UL
>   		unsigned int samples = sample_num[i_max - 1] - s->sample;
> @@ -359,10 +359,10 @@ static int msi3101_convert_stream_384(struct msi3101_state *s, u8 *dst,
>   		dst_len += 984;
>   	}
>
> -	/* calculate samping rate and output it in 10 seconds intervals */
> -	if ((s->jiffies_next + msecs_to_jiffies(10000)) <= jiffies) {
> +	/* calculate sampling rate and output it in 10 seconds intervals */
> +	if (time_before_eq(s->jiffies_next + 10 * HZ, jiffies)) {
>   		unsigned long jiffies_now = jiffies;
> -		unsigned long msecs = jiffies_to_msecs(jiffies_now) - jiffies_to_msecs(s->jiffies_next);
> +		unsigned long msecs = jiffies_to_msecs(jiffies_now - s->jiffies_next);
>   		unsigned int samples = sample_num[i_max - 1] - s->sample;
>   		s->jiffies_next = jiffies_now;
>   		s->sample = sample_num[i_max - 1];
> @@ -424,10 +424,10 @@ static int msi3101_convert_stream_336(struct msi3101_state *s, u8 *dst,
>   		dst_len += 1008;
>   	}
>
> -	/* calculate samping rate and output it in 10 seconds intervals */
> -	if ((s->jiffies_next + msecs_to_jiffies(10000)) <= jiffies) {
> +	/* calculate sampling rate and output it in 10 seconds intervals */
> +	if (time_before_eq(s->jiffies_next + 10 * HZ, jiffies)) {
>   		unsigned long jiffies_now = jiffies;
> -		unsigned long msecs = jiffies_to_msecs(jiffies_now) - jiffies_to_msecs(s->jiffies_next);
> +		unsigned long msecs = jiffies_to_msecs(jiffies_now - s->jiffies_next);
>   		unsigned int samples = sample_num[i_max - 1] - s->sample;
>   		s->jiffies_next = jiffies_now;
>   		s->sample = sample_num[i_max - 1];
> @@ -487,10 +487,10 @@ static int msi3101_convert_stream_252(struct msi3101_state *s, u8 *dst,
>   		dst_len += 1008;
>   	}
>
> -	/* calculate samping rate and output it in 10 seconds intervals */
> -	if ((s->jiffies_next + msecs_to_jiffies(10000)) <= jiffies) {
> +	/* calculate sampling rate and output it in 10 seconds intervals */
> +	if (time_before_eq(s->jiffies_next + 10 * HZ, jiffies)) {
>   		unsigned long jiffies_now = jiffies;
> -		unsigned long msecs = jiffies_to_msecs(jiffies_now) - jiffies_to_msecs(s->jiffies_next);
> +		unsigned long msecs = jiffies_to_msecs(jiffies_now - s->jiffies_next);
>   		unsigned int samples = sample_num[i_max - 1] - s->sample;
>   		s->jiffies_next = jiffies_now;
>   		s->sample = sample_num[i_max - 1];
> @@ -560,7 +560,7 @@ static int msi3101_convert_stream_252_u16(struct msi3101_state *s, u8 *dst,
>   		dst_len += 1008;
>   	}
>
> -	/* calculate samping rate and output it in 10 seconds intervals */
> +	/* calculate sampling rate and output it in 10 seconds intervals */
>   	if (unlikely(time_is_before_jiffies(s->jiffies_next))) {
>   #define MSECS 10000UL
>   		unsigned int samples = sample_num[i_max - 1] - s->sample;


--
http://palosaari.fi/
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/