drivers/scsi/u14-34f.c : Use of the time_before() macro
Subsystems (2)
PATCH 1/1 drivers/scsi/u14-34f.c : Use of the time_before() macro
Use of the time_before() macro, defined at linux/jiffies.h, which deal with wrapping correctly and are nicer to read.
drivers/scsi/u14-34f.c +8 -4
@@ -421,6 +421,7 @@#include <linux/init.h> #include <linux/ctype.h> #include <linux/spinlock.h> +#include <linux/jiffies.h> #include <asm/dma.h> #include <asm/irq.h>
@@ -746,7 +747,8 @@static int board_inquiry (unsigned int j) {struct mscp *cpp;dma_addr_t id_dma_addr; -unsigned int time, limit =0 ; +unsigned int limit =0 ; +unsigned long time; id_dma_addr =pci_map_single (HD (j)->pdev,HD (j)->board_id,sizeof (HD (j)->board_id),PCI_DMA_BIDIRECTIONAL );
@@ -779,7 +781,7 @@spin_unlock_irq (&driver_lock); time = jiffies; -while ((jiffies - time) <HZ && limit++ <20000 )udelay (100L ); +while (time_before (jiffies, time +HZ ) && limit++ <20000 )udelay (100L );spin_lock_irq (&driver_lock);if (cpp->adapter_status ||HD (j)->cp_stat[0 ] !=FREE ) {
@@ -1409,7 +1411,8 @@ }static int u14_34f_eh_host_reset (struct scsi_cmnd *SCarg) { -unsigned int i, j, time, k, c, limit =0 ; +unsigned int i, j, k, c, limit =0 ; +unsigned long time;int arg_done = FALSE;struct scsi_cmnd *SCpnt;
@@ -1496,7 +1499,8 @@spin_unlock_irq (sh[j]->host_lock); time = jiffies; -while ((jiffies - time) < (10 *HZ ) && limit++ <200000 )udelay (100L ); +while (time_before (jiffies, time + (10 *HZ )) + && limit++ <200000 )udelay (100L );spin_lock_irq (sh[j]->host_lock);printk ("%s: reset, interrupts disabled, loops %d.\n" ,BN (j), limit);
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors
Re: [KJ] [PATCH] drivers/scsi/u14-34f.c : Use of the time_before()
Quoted 26 lines · Marcelo Feitoza Parisi
Use of the
time_before()macro, defined atlinux/jiffies.h, which deal with wrapping correctly and are nicer to read.Signed-off-by Marcelo Feitoza Parisi <[email protected]>drivers/scsi/u14-34f.c +3
-1@@ -421,6 +421,7 @@#include <linux/init.h> #include <linux/ctype.h> #include <linux/spinlock.h> +#include <linux/jiffies.h> #include <asm/dma.h> #include <asm/irq.h> @@ -746,7 +747,8 @@static int board_inquiry (unsigned int j) {struct mscp *cpp;dma_addr_t id_dma_addr; -unsigned int time, limit =0 ; +unsigned int limit =0 ; +unsigned long time; id_dma_addr =pci_map_single (HD (j)->pdev,HD (j)->board_id,sizeof (HD (j)->board_id),PCI_DMA_BIDIRECTIONAL );
drivers/scsi/u14-34f.c line 784
Quoted 5 lines
drivers/scsi/u14-34f.c +1
-1@@ -779,7 +781,7 @@spin_unlock_irq (&driver_lock); time = jiffies; -while ((jiffies - time) <HZ && limit++ <20000 )udelay (100L ); +while (time_before (jiffies, time +HZ ) && limit++ <20000 )udelay (100L );
This looks similar, hehe. I wonder how many times it got copy pasted.ssleep() should be better.
drivers/scsi/u14-34f.c line 1503
Quoted 3 lines
drivers/scsi/u14-34f.c +2
-1-while ((jiffies - time) < (10 *HZ ) && limit++ <200000 )udelay (100L ); +while (time_before (jiffies, time + (10 *HZ )) + && limit++ <200000 )udelay (100L );
Ditto.
_______________________________________________
Kernel-janitors mailing list
[email protected]
https://lists.osdl.org/mailman/listinfo/kernel-janitors