Skip to contentSkip to conversation

Leave ata_probe_timeout in seconds

PATCH New Matthew Wilcox 1 participant 1 message Jul 21, 2008 libata

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Leave ata_probe_timeout in seconds

ata_probe_timeout is documented to be in seconds. It's confusing to turn it into a count in jiffies in the init routine, then convert it to milliseconds in the only place in which it is used. It also makes /sys/module/libata/parameters/ata_probe_timeout report the wrong value.

drivers/ata/libata-core.c +1 -3
index 303fc0d..94ab77b 100644
@@ -1685,7 +1685,7 @@ unsigned ata_exec_internal_sg(struct ata_device *dev,
 	spin_unlock_irqrestore(ap->lock, flags);
 
 	if (!timeout)
-		timeout = ata_probe_timeout * 1000 / HZ;
+		timeout = ata_probe_timeout * 1000;
 
 	rc = wait_for_completion_timeout(&wait, msecs_to_jiffies(timeout));
 
@@ -6073,8 +6073,6 @@ static void __init ata_parse_force_param(void)
 
 static int __init ata_init(void)
 {
-	ata_probe_timeout *= HZ;
-
 	ata_parse_force_param();
 
 	ata_wq = create_workqueue("ata");
Signature · 4 lines
Intel are signing my paycheques ... these opinions are still mine
"Bill, look, we understand that you're interested in selling us this
operating system, but compare it to ours.  We can't possibly take such
a retrograde step."