[KJ] [PATCH] drivers/ieee1394/hosts.c : Use of time_after() macro

[KJ] [PATCH] drivers/ieee1394/hosts.c : Use of time_after() macro

[Marcelo Feitoza Parisi]

Use of time_after() macro, defined at linux/jiffies.h, which deal with
wrapping correctly and are nicer to read.

-- 

Marcelo Feitoza Parisi            
marcelo at feitoza.com.br
http://marcelo.feitoza.com.br/


Signed-off-by: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>

--- linux/drivers/ieee1394/hosts.c 2005-03-02 04:38:07.000000000 -0300
+++ development/drivers/ieee1394/hosts.c 2005-04-09 22:06:53.000000000 -0300
@@ -18,6 +18,7 @@
#include <linux/slab.h>
#include <linux/pci.h>
#include <linux/timer.h>
+#include <linux/jiffies.h>

#include "csr1212.h"
#include "ieee1394.h"
@@ -217,7 +218,7 @@ int hpsb_update_config_rom_image(struct

    /* IEEE 1394a-2000 prohibits using the same generation number
    * twice in a 60 second period. */
    - if (jiffies - host->csr.gen_timestamp[next_gen] < 60 * HZ)
    + if (time_after(jiffies, host->csr.gen_timestamp[next_gen] - 60 * HZ))
        /* Wait 60 seconds from the last time this generation number was
        * used. */
        reset_delay = (60 * HZ) + host->csr.gen_timestamp[next_gen] - 
jiffies;
_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

Re: [KJ] [PATCH] drivers/ieee1394/hosts.c : Use of time_after() macro

[Nish Aravamudan]

On 4/13/05, Marcelo Feitoza Parisi <marcelo@feitoza.com.br> wrote:
> Use of time_after() macro, defined at linux/jiffies.h, which deal with
> wrapping correctly and are nicer to read.
> 
> --
> 
> Marcelo Feitoza Parisi
> marcelo at feitoza.com.br
> http://marcelo.feitoza.com.br/
> 
> Signed-off-by: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>
> 
> --- linux/drivers/ieee1394/hosts.c 2005-03-02 04:38:07.000000000 -0300
> +++ development/drivers/ieee1394/hosts.c 2005-04-09 22:06:53.000000000 -0300
> @@ -18,6 +18,7 @@
> #include <linux/slab.h>
> #include <linux/pci.h>
> #include <linux/timer.h>
> +#include <linux/jiffies.h>
> 
> #include "csr1212.h"
> #include "ieee1394.h"
> @@ -217,7 +218,7 @@ int hpsb_update_config_rom_image(struct
> 
>     /* IEEE 1394a-2000 prohibits using the same generation number
>     * twice in a 60 second period. */
>     - if (jiffies - host->csr.gen_timestamp[next_gen] < 60 * HZ)
>     + if (time_after(jiffies, host->csr.gen_timestamp[next_gen] - 60 * HZ))

I think this should be

if (time_before(jiffies, host->csr.gen_timestamp[next_gen] + 60 * HZ))

subtracting in a comparison is somehow confusing to me :)

Thanks,
Nish

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

[KJ] [PATCH] drivers/ieee1394/hosts.c : Use of time_before()

[Marcelo Feitoza Parisi]

Again, following Nish's instruction, the time_after() macro, was 
removed, and a time_before() macro was placed there.

Signed-off-by: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>

--- linux/drivers/ieee1394/hosts.c      2005-03-02 04:38:07.000000000 -0300
+++ development/drivers/ieee1394/hosts.c        2005-04-14 
18:44:06.000000000 -0300
@@ -18,6 +18,7 @@
 #include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/timer.h>
+#include <linux/jiffies.h>

 #include "csr1212.h"
 #include "ieee1394.h"
@@ -217,7 +218,7 @@

        /* IEEE 1394a-2000 prohibits using the same generation number
         * twice in a 60 second period. */
-       if (jiffies - host->csr.gen_timestamp[next_gen] < 60 * HZ)
+       if (time_before(jiffies, host->csr.gen_timestamp[next_gen] + 60 
* HZ))
                /* Wait 60 seconds from the last time this generation 
number was
                 * used. */
                reset_delay = (60 * HZ) + 
host->csr.gen_timestamp[next_gen] - jiffies;

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
http://lists.osdl.org/mailman/listinfo/kernel-janitors

[KJ] [PATCH] drivers/ieee1394/hosts.c : Use of time_before macro

[Marcelo Feitoza Parisi]

[-- Attachment #1: Type: text/plain, Size: 114 bytes --]

Use of time_before() macro, defined at linux/jiffies.h, which deal with
wrapping correctly and are nicer to read.

[-- Attachment #2: hosts.patch --]
[-- Type: text/x-patch, Size: 791 bytes --]

Signed-off-by: Marcelo Feitoza Parisi <marcelo@feitoza.com.br>

--- linux/drivers/ieee1394/hosts.c	2005-06-17 16:48:29.000000000 -0300
+++ linux-kj/drivers/ieee1394/hosts.c	2005-07-07 20:38:07.609477888 -0300
@@ -18,6 +18,7 @@
 #include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/timer.h>
+#include <linux/jiffies.h>
 
 #include "csr1212.h"
 #include "ieee1394.h"
@@ -217,7 +218,7 @@
 
 	/* IEEE 1394a-2000 prohibits using the same generation number
 	 * twice in a 60 second period. */
-	if (jiffies - host->csr.gen_timestamp[next_gen] < 60 * HZ)
+	if (time_before(jiffies, host->csr.gen_timestamp[next_gen] + 60 * HZ))
 		/* Wait 60 seconds from the last time this generation number was
 		 * used. */
 		reset_delay = (60 * HZ) + host->csr.gen_timestamp[next_gen] - jiffies;

[-- Attachment #3: Type: text/plain, Size: 168 bytes --]

_______________________________________________
Kernel-janitors mailing list
Kernel-janitors@lists.osdl.org
https://lists.osdl.org/mailman/listinfo/kernel-janitors