x86: make vsmp_init void, instead of static int
authorGlauber Costa <gcosta@redhat.com>
Mon, 11 Feb 2008 19:16:02 +0000 (17:16 -0200)
committerIngo Molnar <mingo@elte.hu>
Thu, 17 Apr 2008 15:40:47 +0000 (17:40 +0200)
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ravikiran Thirumalai <kiran@scalemp.com>
Acked-by: Shai Fultheim <shai@scalemp.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
arch/x86/kernel/vsmp_64.c

index d971210a6d367d4d171338279e44eb2ce44cef7d..976691726de4f6b650209230e947ef518c511e95 100644 (file)
 #include <asm/pci-direct.h>
 #include <asm/io.h>
 
 #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())
 {
        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))
 
        /* 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;
+               return;
 
        /* set vSMP magic bits to indicate vSMP capable kernel */
        address = ioremap(read_pci_config(0, 0x1f, 0, PCI_BASE_ADDRESS_0), 8);
 
        /* set vSMP magic bits to indicate vSMP capable kernel */
        address = ioremap(read_pci_config(0, 0x1f, 0, PCI_BASE_ADDRESS_0), 8);
@@ -46,7 +46,7 @@ static int __init vsmp_init(void)
        }
 
        iounmap(address);
        }
 
        iounmap(address);
-       return 0;
+       return;
 }
 
 core_initcall(vsmp_init);
 }
 
 core_initcall(vsmp_init);