Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-10-30 16:51:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

powerpc/amigaone: Convert amigaone_init() to a machine_device_initcall()

Browse Source 
This allows to remove the ppc_md.init() hook in the setup code.

Signed-off-by: Gerhard Pircher <gerhard_pircher@gmx.net>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Gerhard Pircher 2009-06-19 11:40:57 +00:00 committed by Benjamin Herrenschmidt
parent c124891f50
commit 66dc3304f3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/powerpc/platforms/amigaone/setup.c
View File

@ -110,13 +110,16 @@ void __init amigaone_init_IRQ(void)
irq_set_default_host(i8259_get_host()); irq_set_default_host(i8259_get_host());
} }
void __init amigaone_init(void) static int __init request_isa_regions(void)
{ {
request_region(0x00, 0x20, "dma1"); request_region(0x00, 0x20, "dma1");
request_region(0x40, 0x20, "timer"); request_region(0x40, 0x20, "timer");
request_region(0x80, 0x10, "dma page reg"); request_region(0x80, 0x10, "dma page reg");
request_region(0xc0, 0x20, "dma2"); request_region(0xc0, 0x20, "dma2");
return 0;
} }
machine_device_initcall(amigaone, request_isa_regions);
void amigaone_restart(char *cmd) void amigaone_restart(char *cmd)
{ {
@ -161,7 +164,6 @@ define_machine(amigaone) {
.name = "AmigaOne", .name = "AmigaOne",
.probe = amigaone_probe, .probe = amigaone_probe,
.setup_arch = amigaone_setup_arch, .setup_arch = amigaone_setup_arch,
.init = amigaone_init,
.show_cpuinfo = amigaone_show_cpuinfo, .show_cpuinfo = amigaone_show_cpuinfo,
.init_IRQ = amigaone_init_IRQ, .init_IRQ = amigaone_init_IRQ,
.restart = amigaone_restart, .restart = amigaone_restart,