From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751174AbaFOJrc (ORCPT ); Sun, 15 Jun 2014 05:47:32 -0400 Received: from mail.kapsi.fi ([217.30.184.167]:42803 "EHLO mail.kapsi.fi" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750743AbaFOJr3 (ORCPT ); Sun, 15 Jun 2014 05:47:29 -0400 Message-ID: <539D6BA8.6010802@iki.fi> Date: Sun, 15 Jun 2014 12:47:20 +0300 From: Antti Palosaari User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: =?UTF-8?B?TWFudWVsIFNjaMO2bGxpbmc=?= CC: m.chehab@samsung.com, gregkh@linuxfoundation.org, linux-media@vger.kernel.org, devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org Subject: Re: [PATCH] msi3103: Use time_before_eq() References: <1401021579-22481-1-git-send-email-manuel.schoelling@gmx.de> In-Reply-To: <1401021579-22481-1-git-send-email-manuel.schoelling@gmx.de> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-SA-Exim-Connect-IP: 85.23.164.3 X-SA-Exim-Mail-From: crope@iki.fi X-SA-Exim-Scanned: No (on mail.kapsi.fi); SAEximRunCond expanded to false Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Acked-by: Antti Palosaari Reviewed-by: Antti Palosaari 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 > --- > 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/