Merge tag 'devicetree-for-linus' of git://git.secretlab.ca/git/linux

[deliverable/linux.git] / drivers / clocksource / acpi_pm.c

diff --git a/drivers/clocksource/acpi_pm.c b/drivers/clocksource/acpi_pm.c
index 5d1b9268bcaf4a99d3f7024852c962209a62bb5d..6eab8898567031cf0e6519ec6d0d970340fc1705 100644 (file)
--- a/drivers/clocksource/acpi_pm.c
+++ b/drivers/clocksource/acpi_pm.c
@@ -73,7 +73,7 @@ static struct clocksource clocksource_acpi_pm = {
 
 
 #ifdef CONFIG_PCI
-static int __devinitdata acpi_pm_good;
+static int acpi_pm_good;
 static int __init acpi_pm_good_setup(char *__str)
 {
        acpi_pm_good = 1;
@@ -102,7 +102,7 @@ static inline void acpi_pm_need_workaround(void)
  * incorrect when read). As a result, the ACPI free running count up
  * timer specification is violated due to erroneous reads.
  */
-static void __devinit acpi_pm_check_blacklist(struct pci_dev *dev)
+static void acpi_pm_check_blacklist(struct pci_dev *dev)
 {
        if (acpi_pm_good)
                return;
@@ -120,7 +120,7 @@ static void __devinit acpi_pm_check_blacklist(struct pci_dev *dev)
 DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_82371AB_3,
                        acpi_pm_check_blacklist);
 
-static void __devinit acpi_pm_check_graylist(struct pci_dev *dev)
+static void acpi_pm_check_graylist(struct pci_dev *dev)
 {
        if (acpi_pm_good)
                return;
@@ -200,14 +200,14 @@ static int __init init_acpi_pm_clocksource(void)
                        if ((value2 < value1) && ((value2) < 0xFFF))
                                break;
                        printk(KERN_INFO "PM-Timer had inconsistent results:"
-                              " 0x%#llx, 0x%#llx - aborting.\n",
+                              " %#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 "
-                              " (0x%#llx) - aborting.\n", value1);
+                              " (%#llx) - aborting.\n", value1);
                        pmtmr_ioport = 0;
                        return -ENODEV;
                }