patch-2.4.1 linux/drivers/acpi/table.c

• Lines: 35
• Date: Mon Jan 29 10:15:59 2001
• Orig file: v2.4.0/linux/drivers/acpi/table.c
• Orig date: Fri Dec 29 14:07:21 2000

diff -u --recursive --new-file v2.4.0/linux/drivers/acpi/table.c linux/drivers/acpi/table.c
@@ -47,21 +47,6 @@
 		return -ENODEV;
 	}
 
-	if (acpi_fadt.plvl2_lat
-	    && acpi_fadt.plvl2_lat <= ACPI_MAX_P_LVL2_LAT) {
-		acpi_c2_exit_latency
-			= ACPI_MICROSEC_TO_TMR_TICKS(acpi_fadt.plvl2_lat);
-		acpi_c2_enter_latency
-			= ACPI_MICROSEC_TO_TMR_TICKS(ACPI_TMR_HZ / 1000);
-	}
-	if (acpi_fadt.plvl3_lat
-	    && acpi_fadt.plvl3_lat <= ACPI_MAX_P_LVL3_LAT) {
-		acpi_c3_exit_latency
-			= ACPI_MICROSEC_TO_TMR_TICKS(acpi_fadt.plvl3_lat);
-		acpi_c3_enter_latency
-			= ACPI_MICROSEC_TO_TMR_TICKS(acpi_fadt.plvl3_lat * 5);
-	}
-
 	return 0;
 }
 
@@ -71,11 +56,7 @@
 int
 acpi_find_and_load_tables(u64 rsdp)
 {
-	if (ACPI_SUCCESS(acpi_load_tables(rsdp)))
-	{
-		printk(KERN_INFO "ACPI: System description tables loaded\n");
-	}
-	else {
+	if (!ACPI_SUCCESS(acpi_load_tables(rsdp))) {
 		printk(KERN_INFO "ACPI: System description table load failed\n");
 		acpi_terminate();
 		return -1;