On Wed, 2008-01-02 at 12:14 -0700, Grant Likely wrote: > From: Grant Likely <[EMAIL PROTECTED]> > > Signed-off-by: Grant Likely <[EMAIL PROTECTED]>
Ack. > > arch/powerpc/platforms/powermac/low_i2c.c | 7 ++----- > arch/powerpc/platforms/powermac/pfunc_base.c | 3 +-- > arch/powerpc/platforms/powermac/pic.c | 3 +-- > arch/powerpc/platforms/powermac/setup.c | 12 ++---------- > 4 files changed, 6 insertions(+), 19 deletions(-) > > diff --git a/arch/powerpc/platforms/powermac/low_i2c.c > b/arch/powerpc/platforms/powermac/low_i2c.c > index da2007e..9c9299c 100644 > --- a/arch/powerpc/platforms/powermac/low_i2c.c > +++ b/arch/powerpc/platforms/powermac/low_i2c.c > @@ -1462,9 +1462,6 @@ int __init pmac_i2c_init(void) > return 0; > i2c_inited = 1; > > - if (!machine_is(powermac)) > - return 0; > - > /* Probe keywest-i2c busses */ > kw_i2c_probe(); > > @@ -1483,7 +1480,7 @@ int __init pmac_i2c_init(void) > > return 0; > } > -arch_initcall(pmac_i2c_init); > +machine_arch_initcall(powermac, pmac_i2c_init); > > /* Since pmac_i2c_init can be called too early for the platform device > * registration, we need to do it at a later time. In our case, subsys > @@ -1515,4 +1512,4 @@ static int __init pmac_i2c_create_platform_devices(void) > > return 0; > } > -subsys_initcall(pmac_i2c_create_platform_devices); > +machine_subsys_initcall(powermac, pmac_i2c_create_platform_devices); > diff --git a/arch/powerpc/platforms/powermac/pfunc_base.c > b/arch/powerpc/platforms/powermac/pfunc_base.c > index 45d54b9..db20de5 100644 > --- a/arch/powerpc/platforms/powermac/pfunc_base.c > +++ b/arch/powerpc/platforms/powermac/pfunc_base.c > @@ -363,8 +363,7 @@ int __init pmac_pfunc_base_install(void) > > return 0; > } > - > -arch_initcall(pmac_pfunc_base_install); > +machine_arch_initcall(powermac, pmac_pfunc_base_install); > > #ifdef CONFIG_PM > > diff --git a/arch/powerpc/platforms/powermac/pic.c > b/arch/powerpc/platforms/powermac/pic.c > index 999f5e1..cd72164 100644 > --- a/arch/powerpc/platforms/powermac/pic.c > +++ b/arch/powerpc/platforms/powermac/pic.c > @@ -690,6 +690,5 @@ static int __init init_pmacpic_sysfs(void) > sysdev_driver_register(&pmacpic_sysclass, &driver_pmacpic); > return 0; > } > - > -subsys_initcall(init_pmacpic_sysfs); > +machine_subsys_initcall(powermac, init_pmacpic_sysfs); > > diff --git a/arch/powerpc/platforms/powermac/setup.c > b/arch/powerpc/platforms/powermac/setup.c > index adad4e9..36ff1b6 100644 > --- a/arch/powerpc/platforms/powermac/setup.c > +++ b/arch/powerpc/platforms/powermac/setup.c > @@ -397,17 +397,13 @@ static int initializing = 1; > > static int pmac_late_init(void) > { > - if (!machine_is(powermac)) > - return -ENODEV; > - > initializing = 0; > /* this is udbg (which is __init) and we can later use it during > * cpu hotplug (in smp_core99_kick_cpu) */ > ppc_md.progress = NULL; > return 0; > } > - > -late_initcall(pmac_late_init); > +machine_late_initcall(powermac, pmac_late_init); > > /* > * This is __init_refok because we check for "initializing" before > @@ -534,9 +530,6 @@ static int __init pmac_declare_of_platform_devices(void) > if (machine_is(chrp)) > return -1; > > - if (!machine_is(powermac)) > - return 0; > - > np = of_find_node_by_name(NULL, "valkyrie"); > if (np) > of_platform_device_create(np, "valkyrie", NULL); > @@ -551,8 +544,7 @@ static int __init pmac_declare_of_platform_devices(void) > > return 0; > } > - > -device_initcall(pmac_declare_of_platform_devices); > +machine_device_initcall(powermac, pmac_declare_of_platform_devices); > > /* > * Called very early, MMU is off, device-tree isn't unflattened _______________________________________________ Linuxppc-dev mailing list Linuxppc-dev@ozlabs.org https://ozlabs.org/mailman/listinfo/linuxppc-dev