x86: make vsmp_init void, instead of static int

[sfrench/cifs-2.6.git] / arch / x86 / kernel / vsmp_64.c

diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c
index 414caf0c5f9ae96b67bafea7589b532fa821b361..976691726de4f6b650209230e947ef518c511e95 100644 (file)
--- a/arch/x86/kernel/vsmp_64.c
+++ b/arch/x86/kernel/vsmp_64.c
@@ -16,34 +16,37 @@
 #include <asm/pci-direct.h>
 #include <asm/io.h>
 
-static int __init vsmp_init(void)
+static void __init vsmp_init(void)
 {
        void *address;
        unsigned int cap, ctl;
 
        if (!early_pci_allowed())
-               return 0;
+               return;
 
        /* Check if we are running on a ScaleMP vSMP box */
-       if ((read_pci_config_16(0, 0x1f, 0, PCI_VENDOR_ID) != PCI_VENDOR_ID_SCALEMP) ||
-           (read_pci_config_16(0, 0x1f, 0, PCI_DEVICE_ID) != PCI_DEVICE_ID_SCALEMP_VSMP_CTL))
-               return 0;
+       if ((read_pci_config_16(0, 0x1f, 0, PCI_VENDOR_ID) !=
+            PCI_VENDOR_ID_SCALEMP) ||
+           (read_pci_config_16(0, 0x1f, 0, PCI_DEVICE_ID) !=
+            PCI_DEVICE_ID_SCALEMP_VSMP_CTL))
+               return;
 
        /* set vSMP magic bits to indicate vSMP capable kernel */
        address = ioremap(read_pci_config(0, 0x1f, 0, PCI_BASE_ADDRESS_0), 8);
        cap = readl(address);
        ctl = readl(address + 4);
-       printk("vSMP CTL: capabilities:0x%08x  control:0x%08x\n", cap, ctl);
+       printk(KERN_INFO "vSMP CTL: capabilities:0x%08x  control:0x%08x\n",
+              cap, ctl);
        if (cap & ctl & (1 << 4)) {
                /* Turn on vSMP IRQ fastpath handling (see system.h) */
                ctl &= ~(1 << 4);
                writel(ctl, address + 4);
                ctl = readl(address + 4);
-               printk("vSMP CTL: control set to:0x%08x\n", ctl);
+               printk(KERN_INFO "vSMP CTL: control set to:0x%08x\n", ctl);
        }
 
        iounmap(address);
-       return 0;
+       return;
 }
 
 core_initcall(vsmp_init);