Skip to content

Commit

Permalink
powerpc/amigaone: Convert amigaone_init() to a machine_device_initcall()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Gerhard Pircher authored and Benjamin Herrenschmidt committed Aug 20, 2009
1 parent c124891 commit 66dc330
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions arch/powerpc/platforms/amigaone/setup.c
Original file line number Diff line number Diff line change
Expand Up @@ -110,13 +110,16 @@ void __init amigaone_init_IRQ(void)
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(0x40, 0x20, "timer");
request_region(0x80, 0x10, "dma page reg");
request_region(0xc0, 0x20, "dma2");

return 0;
}
machine_device_initcall(amigaone, request_isa_regions);

void amigaone_restart(char *cmd)
{
Expand Down Expand Up @@ -161,7 +164,6 @@ define_machine(amigaone) {
.name = "AmigaOne",
.probe = amigaone_probe,
.setup_arch = amigaone_setup_arch,
.init = amigaone_init,
.show_cpuinfo = amigaone_show_cpuinfo,
.init_IRQ = amigaone_init_IRQ,
.restart = amigaone_restart,
Expand Down

0 comments on commit 66dc330

Please sign in to comment.