|
@@ -109,10 +109,8 @@ static void acpi_pm_check_blacklist(struct pci_dev *dev)
|
|
|
|
|
|
/* the bug has been fixed in PIIX4M */
|
|
|
if (dev->revision < 3) {
|
|
|
- printk(KERN_WARNING "* Found PM-Timer Bug on the chipset."
|
|
|
- " Due to workarounds for a bug,\n"
|
|
|
- "* this clock source is slow. Consider trying"
|
|
|
- " other clock sources\n");
|
|
|
+ pr_warn("* Found PM-Timer Bug on the chipset. Due to workarounds for a bug,\n"
|
|
|
+ "* this clock source is slow. Consider trying other clock sources\n");
|
|
|
|
|
|
acpi_pm_need_workaround();
|
|
|
}
|
|
@@ -125,12 +123,9 @@ static void acpi_pm_check_graylist(struct pci_dev *dev)
|
|
|
if (acpi_pm_good)
|
|
|
return;
|
|
|
|
|
|
- printk(KERN_WARNING "* The chipset may have PM-Timer Bug. Due to"
|
|
|
- " workarounds for a bug,\n"
|
|
|
- "* this clock source is slow. If you are sure your timer"
|
|
|
- " does not have\n"
|
|
|
- "* this bug, please use \"acpi_pm_good\" to disable the"
|
|
|
- " workaround\n");
|
|
|
+ pr_warn("* The chipset may have PM-Timer Bug. Due to workarounds for a bug,\n"
|
|
|
+ "* this clock source is slow. If you are sure your timer does not have\n"
|
|
|
+ "* this bug, please use \"acpi_pm_good\" to disable the workaround\n");
|
|
|
|
|
|
acpi_pm_need_workaround();
|
|
|
}
|
|
@@ -162,8 +157,7 @@ static int verify_pmtmr_rate(void)
|
|
|
/* Check that the PMTMR delta is within 5% of what we expect */
|
|
|
if (delta < (PMTMR_EXPECTED_RATE * 19) / 20 ||
|
|
|
delta > (PMTMR_EXPECTED_RATE * 21) / 20) {
|
|
|
- printk(KERN_INFO "PM-Timer running at invalid rate: %lu%% "
|
|
|
- "of normal - aborting.\n",
|
|
|
+ pr_info("PM-Timer running at invalid rate: %lu%% of normal - aborting.\n",
|
|
|
100UL * delta / PMTMR_EXPECTED_RATE);
|
|
|
return -1;
|
|
|
}
|
|
@@ -199,15 +193,14 @@ static int __init init_acpi_pm_clocksource(void)
|
|
|
break;
|
|
|
if ((value2 < value1) && ((value2) < 0xFFF))
|
|
|
break;
|
|
|
- printk(KERN_INFO "PM-Timer had inconsistent results:"
|
|
|
- " %#llx, %#llx - aborting.\n",
|
|
|
- value1, value2);
|
|
|
+ pr_info("PM-Timer had inconsistent results: %#llx, %#llx - aborting.\n",
|
|
|
+ value1, value2);
|
|
|
pmtmr_ioport = 0;
|
|
|
return -EINVAL;
|
|
|
}
|
|
|
if (i == ACPI_PM_READ_CHECKS) {
|
|
|
- printk(KERN_INFO "PM-Timer failed consistency check "
|
|
|
- " (%#llx) - aborting.\n", value1);
|
|
|
+ pr_info("PM-Timer failed consistency check (%#llx) - aborting.\n",
|
|
|
+ value1);
|
|
|
pmtmr_ioport = 0;
|
|
|
return -ENODEV;
|
|
|
}
|