Commit 4e5a800c authored by Nicholas Mc Guire's avatar Nicholas Mc Guire Committed by James Bottomley

ncr5380: Harmonize jiffies conversion with msecs_to_jiffies

Instances of var * HZ / 1000 are replaced by msecs_to_jiffies(var).
In addition some timing constants that assumed HZ 100 were adjusted
to HZ independent settings based on review comments from Michael Schmitz
<schmitzmic@gmail.com> and review of the original drivers in 1.0.31 and
2.2.16.
Signed-off-by: default avatarNicholas Mc Guire <hofrat@osadl.org>
Acked-by: default avatarMichael Schmitz <schmitzmic@gmail.com>
Signed-off-by: default avatarFinn Thain <fthain@telegraphics.com.au>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent b026e8ed
...@@ -474,11 +474,11 @@ static void NCR5380_print_phase(struct Scsi_Host *instance) ...@@ -474,11 +474,11 @@ static void NCR5380_print_phase(struct Scsi_Host *instance)
*/ */
#ifndef USLEEP_SLEEP #ifndef USLEEP_SLEEP
/* 20 ms (reasonable hard disk speed) */ /* 20 ms (reasonable hard disk speed) */
#define USLEEP_SLEEP (20*HZ/1000) #define USLEEP_SLEEP msecs_to_jiffies(20)
#endif #endif
/* 300 RPM (floppy speed) */ /* 300 RPM (floppy speed) */
#ifndef USLEEP_POLL #ifndef USLEEP_POLL
#define USLEEP_POLL (200*HZ/1000) #define USLEEP_POLL msecs_to_jiffies(200)
#endif #endif
#ifndef USLEEP_WAITLONG #ifndef USLEEP_WAITLONG
/* RvC: (reasonable time to wait on select error) */ /* RvC: (reasonable time to wait on select error) */
...@@ -576,7 +576,7 @@ static int __init __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance, ...@@ -576,7 +576,7 @@ static int __init __maybe_unused NCR5380_probe_irq(struct Scsi_Host *instance,
if ((mask & possible) && (request_irq(i, &probe_intr, 0, "NCR-probe", NULL) == 0)) if ((mask & possible) && (request_irq(i, &probe_intr, 0, "NCR-probe", NULL) == 0))
trying_irqs |= mask; trying_irqs |= mask;
timeout = jiffies + (250 * HZ / 1000); timeout = jiffies + msecs_to_jiffies(250);
probe_irq = NO_IRQ; probe_irq = NO_IRQ;
/* /*
...@@ -634,7 +634,7 @@ static void prepare_info(struct Scsi_Host *instance) ...@@ -634,7 +634,7 @@ static void prepare_info(struct Scsi_Host *instance)
"sg_tablesize %d, this_id %d, " "sg_tablesize %d, this_id %d, "
"flags { %s%s%s}, " "flags { %s%s%s}, "
#if defined(USLEEP_POLL) && defined(USLEEP_WAITLONG) #if defined(USLEEP_POLL) && defined(USLEEP_WAITLONG)
"USLEEP_POLL %d, USLEEP_WAITLONG %d, " "USLEEP_POLL %lu, USLEEP_WAITLONG %lu, "
#endif #endif
"options { %s} ", "options { %s} ",
instance->hostt->name, instance->io_port, instance->n_io_port, instance->hostt->name, instance->io_port, instance->n_io_port,
...@@ -1346,7 +1346,7 @@ static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd) ...@@ -1346,7 +1346,7 @@ static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd)
* selection. * selection.
*/ */
timeout = jiffies + (250 * HZ / 1000); timeout = jiffies + msecs_to_jiffies(250);
/* /*
* XXX very interesting - we're seeing a bounce where the BSY we * XXX very interesting - we're seeing a bounce where the BSY we
......
...@@ -1486,7 +1486,7 @@ static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd) ...@@ -1486,7 +1486,7 @@ static int NCR5380_select(struct Scsi_Host *instance, struct scsi_cmnd *cmd)
* selection. * selection.
*/ */
timeout = jiffies + (250 * HZ / 1000); timeout = jiffies + msecs_to_jiffies(250);
/* /*
* XXX very interesting - we're seeing a bounce where the BSY we * XXX very interesting - we're seeing a bounce where the BSY we
......
...@@ -57,9 +57,9 @@ ...@@ -57,9 +57,9 @@
*/ */
/* settings for DTC3181E card with only Mustek scanner attached */ /* settings for DTC3181E card with only Mustek scanner attached */
#define USLEEP_POLL 1 #define USLEEP_POLL msecs_to_jiffies(10)
#define USLEEP_SLEEP 20 #define USLEEP_SLEEP msecs_to_jiffies(200)
#define USLEEP_WAITLONG 500 #define USLEEP_WAITLONG msecs_to_jiffies(5000)
#define AUTOPROBE_IRQ #define AUTOPROBE_IRQ
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment