luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sparc64: Don't invoke power_init() from pcibios_init().

Browse Source 
That's just silly, use device_initcall() instead.

Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller 2008-08-30 01:18:56 -07:00
parent e0ac612e69
commit c510b9bfa1
2 changed files with 5 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/sparc64/kernel/pci.c
View File

@ -799,8 +799,6 @@ static void __init pci_scan_each_controller_bus(void)
pbm->scan_bus(pbm);
}
extern void power_init(void);
static int __init pcibios_init(void)
{
pci_controller_probe();
@ -809,8 +807,6 @@ static int __init pcibios_init(void)
pci_scan_each_controller_bus();
power_init();
return 0;
}

16
arch/sparc64/kernel/power.c
View File

@ -1,29 +1,22 @@
/* power.c: Power management driver.
*
* Copyright (C) 1999, 2007 David S. Miller (davem@davemloft.net)
* Copyright (C) 1999, 2007, 2008 David S. Miller (davem@davemloft.net)
*/
#include <linux/kernel.h>
#include <linux/module.h>
#include <linux/init.h>
#include <linux/sched.h>
#include <linux/signal.h>
#include <linux/delay.h>
#include <linux/interrupt.h>
#include <linux/pm.h>
#include <linux/syscalls.h>
#include <linux/reboot.h>
#include <linux/of_device.h>
#include <asm/system.h>
#include <asm/auxio.h>
#include <asm/prom.h>
#include <asm/io.h>
#include <asm/sstate.h>
#include <asm/reboot.h>
#include <linux/unistd.h>
/*
* sysctl - toggle power-off restriction for serial console
* systems in machine_power_off()
@ -111,8 +104,9 @@ static struct of_platform_driver power_driver = {
},
};
void __init power_init(void)
static int __init power_init(void)
{
of_register_driver(&power_driver, &of_platform_bus_type);
return;
return of_register_driver(&power_driver, &of_platform_bus_type);
}
device_initcall(power_init);