From patchwork Fri Jun 19 21:40:57 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gerhard Pircher X-Patchwork-Id: 28922 X-Patchwork-Delegate: benh@kernel.crashing.org Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 984CDB7282 for ; Sat, 20 Jun 2009 07:41:29 +1000 (EST) Received: by ozlabs.org (Postfix) id 8BA31DDDA0; Sat, 20 Jun 2009 07:41:29 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (bilbo.ozlabs.org [203.10.76.25]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "bilbo.ozlabs.org", Issuer "CAcert Class 3 Root" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id 89EB9DDD0C for ; Sat, 20 Jun 2009 07:41:29 +1000 (EST) Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by bilbo.ozlabs.org (Postfix) with ESMTP id 5F36AB7282 for ; Sat, 20 Jun 2009 07:41:10 +1000 (EST) Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id 7019BB7271 for ; Sat, 20 Jun 2009 07:41:02 +1000 (EST) Received: by ozlabs.org (Postfix) id 60004DDD1C; Sat, 20 Jun 2009 07:41:02 +1000 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from mail.gmx.net (mail.gmx.net [213.165.64.20]) by ozlabs.org (Postfix) with SMTP id 3D9F6DDD1B for ; Sat, 20 Jun 2009 07:41:00 +1000 (EST) Received: (qmail 3764 invoked by uid 0); 19 Jun 2009 21:40:58 -0000 Received: from 85.127.160.216 by www018.gmx.net with HTTP; Fri, 19 Jun 2009 23:40:57 +0200 (CEST) Date: Fri, 19 Jun 2009 23:40:57 +0200 From: "Gerhard Pircher" Message-ID: <20090619214057.198360@gmx.net> MIME-Version: 1.0 Subject: [PATCH] powerpc/amigaone: Convert amigaone_init() to a machine_device_initcall() To: Kumar Gala , linuxppc-dev@ozlabs.org X-Authenticated: #6097454 X-Flags: 0001 X-Mailer: WWW-Mail 6100 (Global Message Exchange) X-Priority: 3 X-Provags-ID: V01U2FsdGVkX1+Q6hUJnHGQmkXviRniCzEjtNuM8YsFuSYrA++qoX 4Zpjw3C0PDuY//ihSsb0NItoqi45R4z3lmHg== X-GMX-UID: 0TIPfj4/f2IsAnljMWxoOHh4dWxlcxa4 X-FuHaFi: 0.62 X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org This allows to remove the ppc_md.init() hook in the setup code. Signed-off-by: Gerhard Pircher --- arch/powerpc/platforms/amigaone/setup.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/arch/powerpc/platforms/amigaone/setup.c b/arch/powerpc/platforms/amigaone/setup.c index e8bea5e..ca65d86 100644 --- a/arch/powerpc/platforms/amigaone/setup.c +++ b/arch/powerpc/platforms/amigaone/setup.c @@ -111,13 +111,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) { @@ -162,7 +165,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,