From: Antti Palosaari <crope@iki.fi>
To: "Manuel Schölling" <manuel.schoelling@gmx.de>
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()
Date: Sun, 15 Jun 2014 09:47:20 +0000 [thread overview]
Message-ID: <539D6BA8.6010802@iki.fi> (raw)
In-Reply-To: <1401021579-22481-1-git-send-email-manuel.schoelling@gmx.de>
Acked-by: Antti Palosaari <crope@iki.fi>
Reviewed-by: Antti Palosaari <crope@iki.fi>
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@gmx.de>
> ---
> 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/
WARNING: multiple messages have this Message-ID (diff)
From: Antti Palosaari <crope@iki.fi>
To: "Manuel Schölling" <manuel.schoelling@gmx.de>
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()
Date: Sun, 15 Jun 2014 12:47:20 +0300 [thread overview]
Message-ID: <539D6BA8.6010802@iki.fi> (raw)
In-Reply-To: <1401021579-22481-1-git-send-email-manuel.schoelling@gmx.de>
Acked-by: Antti Palosaari <crope@iki.fi>
Reviewed-by: Antti Palosaari <crope@iki.fi>
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@gmx.de>
> ---
> 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/
next prev parent reply other threads:[~2014-06-15 9:47 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-05-24 18:47 [PATCH] msi3103: Use time_before_eq() Manuel Schölling
2014-05-24 18:47 ` Manuel Schölling
2014-05-24 19:10 ` Joe Perches
2014-05-24 19:10 ` Joe Perches
2014-05-25 12:39 ` Manuel Schölling
2014-05-25 12:39 ` Manuel Schölling
2014-06-15 9:47 ` Antti Palosaari [this message]
2014-06-15 9:47 ` Antti Palosaari
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=539D6BA8.6010802@iki.fi \
--to=crope@iki.fi \
--cc=devel@driverdev.osuosl.org \
--cc=gregkh@linuxfoundation.org \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=m.chehab@samsung.com \
--cc=manuel.schoelling@gmx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.