Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdddec45 authored by Grant Likely's avatar Grant Likely Committed by Olof Johansson
Browse files

[POWERPC] pasemi: Use machine_*_initcall() hooks in platform code 



Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent f0d4577c

arch/powerpc/platforms/pasemi/idle.c

+1 −4
Original line number Diff line number Diff line
@@ -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)

{

arch/powerpc/platforms/pasemi/setup.c

+2 −8
Original line number Diff line number Diff line
@@ -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);





/*