]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[POWERPC] pasemi: Use machine_*_initcall() hooks in platform code
authorGrant Likely <grant.likely@secretlab.ca>
Wed, 2 Jan 2008 19:32:28 +0000 (12:32 -0700)
committerOlof Johansson <olof@lixom.net>
Wed, 2 Jan 2008 20:08:42 +0000 (14:08 -0600)
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Olof Johansson <olof@lixom.net>
arch/powerpc/platforms/pasemi/idle.c
arch/powerpc/platforms/pasemi/setup.c

index d8e1fcc7851388b51c84b20f77f62638e4189fab..43911d8b0206bb9e3d423ca4e9c12901634ad6b8 100644 (file)
@@ -74,9 +74,6 @@ static int pasemi_system_reset_exception(struct pt_regs *regs)
 
 static int __init pasemi_idle_init(void)
 {
-       if (!machine_is(pasemi))
-               return -ENODEV;
-
 #ifndef CONFIG_PPC_PASEMI_CPUFREQ
        printk(KERN_WARNING "No cpufreq driver, powersavings modes disabled\n");
        current_mode = 0;
@@ -88,7 +85,7 @@ static int __init pasemi_idle_init(void)
 
        return 0;
 }
-late_initcall(pasemi_idle_init);
+machine_late_initcall(pasemi, pasemi_idle_init);
 
 static int __init idle_param(char *p)
 {
index a89d098e41bf8821334b53d94b786d2b5185d588..c64fb5bfb37e3598ea6b44a64332210bc0bf5c8a 100644 (file)
@@ -135,9 +135,6 @@ static int __init pas_setup_mce_regs(void)
        struct pci_dev *dev;
        int reg;
 
-       if (!machine_is(pasemi))
-               return -ENODEV;
-
        /* Remap various SoC status registers for use by the MCE handler */
 
        reg = 0;
@@ -181,7 +178,7 @@ static int __init pas_setup_mce_regs(void)
 
        return 0;
 }
-device_initcall(pas_setup_mce_regs);
+machine_device_initcall(pasemi, pas_setup_mce_regs);
 
 static __init void pas_init_IRQ(void)
 {
@@ -405,9 +402,6 @@ static struct of_device_id pasemi_bus_ids[] = {
 
 static int __init pasemi_publish_devices(void)
 {
-       if (!machine_is(pasemi))
-               return 0;
-
        pasemi_pcmcia_init();
 
        /* Publish OF platform devices for SDC and other non-PCI devices */
@@ -415,7 +409,7 @@ static int __init pasemi_publish_devices(void)
 
        return 0;
 }
-device_initcall(pasemi_publish_devices);
+machine_device_initcall(pasemi, pasemi_publish_devices);
 
 
 /*