From patchwork Tue Apr 23 15:03:14 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 16362 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qc0-f197.google.com (mail-qc0-f197.google.com [209.85.216.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 10D602391B for ; Tue, 23 Apr 2013 15:04:52 +0000 (UTC) Received: by mail-qc0-f197.google.com with SMTP id b14sf1096351qcs.4 for ; Tue, 23 Apr 2013 08:04:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:mime-version:x-beenthere:x-received:received-spf :x-received:x-forwarded-to:x-forwarded-for:delivered-to:x-received :received-spf:x-received:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-google-group-id:list-post:list-help:list-archive:list-unsubscribe; bh=WqZ2KPTumUXvm7jRjVCmNDVWa+NM07rpN2ea69rBk4s=; b=II+IX+hIff+CqeCtBqA8uyne0zMBFXHjDUy3sFb3HdXC4cXulw35I764bsRjrR3NTj UW1FNr4rpm1ok92ojYT9FpPvj5I5Kt/32UXw4r+/HsEzR6/U5VS31JsBoSgcpzngU00J PL1y4R4ROO4pgkDagJ0MCPTs1UbWFdDgpFqzKQRKLBNNVDrRpXy9zVmxVojT/IwsrOga N/rXXJ9lJzM5AE/T/SvC3igNyyYWTZM/L92J8HPJ1rXVOQfVFEEEAjMNFpFmldNA6ZR/ NL5GGKvyVYDdu/xQSTjO0p4Wa/Z0bU+k9RGfkThKanHN4u82gI4uqnfzLzMEx9VAvZxg 0ikg== X-Received: by 10.224.217.195 with SMTP id hn3mr22737665qab.5.1366729443154; Tue, 23 Apr 2013 08:04:03 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.49.73.39 with SMTP id i7ls398346qev.48.gmail; Tue, 23 Apr 2013 08:04:02 -0700 (PDT) X-Received: by 10.58.45.71 with SMTP id k7mr22870766vem.0.1366729442767; Tue, 23 Apr 2013 08:04:02 -0700 (PDT) Received: from mail-vb0-x22e.google.com (mail-vb0-x22e.google.com [2607:f8b0:400c:c02::22e]) by mx.google.com with ESMTPS id ij9si18698610vdb.69.2013.04.23.08.04.02 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 23 Apr 2013 08:04:02 -0700 (PDT) Received-SPF: neutral (google.com: 2607:f8b0:400c:c02::22e is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) client-ip=2607:f8b0:400c:c02::22e; Received: by mail-vb0-f46.google.com with SMTP id 11so671748vbe.5 for ; Tue, 23 Apr 2013 08:04:02 -0700 (PDT) X-Received: by 10.52.228.71 with SMTP id sg7mr18749608vdc.51.1366729442647; Tue, 23 Apr 2013 08:04:02 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.58.127.98 with SMTP id nf2csp129537veb; Tue, 23 Apr 2013 08:04:01 -0700 (PDT) X-Received: by 10.180.79.227 with SMTP id m3mr24215238wix.12.1366729436884; Tue, 23 Apr 2013 08:03:56 -0700 (PDT) Received: from mail-wg0-x235.google.com (mail-wg0-x235.google.com [2a00:1450:400c:c00::235]) by mx.google.com with ESMTPS id au5si5443084wjc.180.2013.04.23.08.03.56 (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 23 Apr 2013 08:03:56 -0700 (PDT) Received-SPF: neutral (google.com: 2a00:1450:400c:c00::235 is neither permitted nor denied by best guess record for domain of lee.jones@linaro.org) client-ip=2a00:1450:400c:c00::235; Received: by mail-wg0-f53.google.com with SMTP id z11so331334wgg.8 for ; Tue, 23 Apr 2013 08:03:56 -0700 (PDT) X-Received: by 10.180.83.199 with SMTP id s7mr37446468wiy.19.1366729436196; Tue, 23 Apr 2013 08:03:56 -0700 (PDT) Received: from localhost.localdomain (cpc34-aztw25-2-0-cust250.18-1.cable.virginmedia.com. [86.16.136.251]) by mx.google.com with ESMTPS id q20sm16491081wiv.7.2013.04.23.08.03.54 (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 23 Apr 2013 08:03:55 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, linus.walleij@stericsson.com, mian.yousaf.kaukab@stericsson.com, Lee Jones Subject: [PATCH 10/10] ARM: ux500: Remove empty function u8500_of_init_devices() Date: Tue, 23 Apr 2013 16:03:14 +0100 Message-Id: <1366729394-11406-11-git-send-email-lee.jones@linaro.org> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1366729394-11406-1-git-send-email-lee.jones@linaro.org> References: <1366729394-11406-1-git-send-email-lee.jones@linaro.org> X-Gm-Message-State: ALoCoQnk51EpPXiFFvIxgjUvdXlv0/+q96sgeRjQmik5Tj/e0SAkS4ElxiDXrSblQ6Z8Kcq0BfU3 X-Original-Sender: lee.jones@linaro.org X-Original-Authentication-Results: mx.google.com; spf=neutral (google.com: 2607:f8b0:400c:c02::22e is neither permitted nor denied by best guess record for domain of patch+caf_=patchwork-forward=linaro.org@linaro.org) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , As promised, now all devices which resided in u8500_of_init_devices() have been enabled for Device Tree, we can completely remove it. Signed-off-by: Lee Jones --- arch/arm/mach-ux500/cpu-db8500.c | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/arch/arm/mach-ux500/cpu-db8500.c b/arch/arm/mach-ux500/cpu-db8500.c index 36ef6ed..a2c83c2 100644 --- a/arch/arm/mach-ux500/cpu-db8500.c +++ b/arch/arm/mach-ux500/cpu-db8500.c @@ -221,15 +221,6 @@ struct device * __init u8500_init_devices(struct ab8500_platform_data *ab8500) } #ifdef CONFIG_MACH_UX500_DT - -/* TODO: Once all pieces are DT:ed, remove completely. */ -static struct device * __init u8500_of_init_devices(void) -{ - struct device *parent = db8500_soc_device_init(); - - return parent; -} - static struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { /* Requires call-back bindings. */ OF_DEV_AUXDATA("arm,cortex-a9-pmu", 0, "arm-pmu", &db8500_pmu_platdata), @@ -288,7 +279,7 @@ static const struct of_device_id u8500_local_bus_nodes[] = { static void __init u8500_init_machine(void) { - struct device *parent = NULL; + struct device *parent = db8500_soc_device_init(); /* Pinmaps must be in place before devices register */ if (of_machine_is_compatible("st-ericsson,mop500")) @@ -301,9 +292,6 @@ static void __init u8500_init_machine(void) else if (of_machine_is_compatible("st-ericsson,ccu9540")) {} /* TODO: Add pinmaps for ccu9540 board. */ - /* TODO: Export SoC, USB, cpu-freq and DMA40 */ - parent = u8500_of_init_devices(); - /* automatically probe child nodes of db8500 device */ of_platform_populate(NULL, u8500_local_bus_nodes, u8500_auxdata_lookup, parent); }