linux-mips
[Top] [All Lists]

[PATCH 28/28] mips: use common of_flat_dt_get_machine_name

To: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org
Subject: [PATCH 28/28] mips: use common of_flat_dt_get_machine_name
From: Rob Herring <robherring2@gmail.com>
Date: Mon, 16 Sep 2013 18:09:24 -0500
Cc: Grant Likely <grant.likely@linaro.org>, Rob Herring <rob.herring@calxeda.com>, Ralf Baechle <ralf@linux-mips.org>, linux-mips@linux-mips.org
Dkim-signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=6FdvWQHxDaFHqBFGBAmSJiF1t9+VyRuzJo0cSgAKs2s=; b=g1D7OfYBVKtosOGj4VN0F2Oezv7KzDGR0wj0yajfL5GKINBei9752R/k/MLTt5oXDA 51SX806V4u1FJ1MMBgvIKBrwugRLule7MCFtaDVMY8UGFvpP1QjgPKb9qZ9JwJBdzDcg w56ckyMS0gKn0z7Z1+PDsCf7b6CBEMuR/rMwV/hiURclH3slb8SrzEo6rDXIWfXD6cvQ D8IKe7z0vEtB1T9MpObRwCh4eO05VSJ8bJ2WzYFuJwBhqVs5N0NTrlObx9myg+5n2tdV V9bLPSNL6674Sih3mLCGFN+BPhhpLiW0PPiDqGInnaen6AFrMRbAsbMeH+BaBgGkWbm1 U2kg==
In-reply-to: <1379372965-22359-1-git-send-email-robherring2@gmail.com>
List-archive: <http://www.linux-mips.org/archives/linux-mips/>
List-help: <mailto:ecartis@linux-mips.org?Subject=help>
List-id: linux-mips <linux-mips.eddie.linux-mips.org>
List-owner: <mailto:ralf@linux-mips.org>
List-post: <mailto:linux-mips@linux-mips.org>
List-software: Ecartis version 1.0.0
List-subscribe: <mailto:ecartis@linux-mips.org?subject=subscribe%20linux-mips>
List-unsubscribe: <mailto:ecartis@linux-mips.org?subject=unsubscribe%20linux-mips>
Original-recipient: rfc822;linux-mips@linux-mips.org
References: <1379372965-22359-1-git-send-email-robherring2@gmail.com>
Sender: linux-mips-bounce@linux-mips.org
From: Rob Herring <rob.herring@calxeda.com>

Convert mips to use the common of_flat_dt_get_machine_name function.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
---
 arch/mips/kernel/prom.c | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/arch/mips/kernel/prom.c b/arch/mips/kernel/prom.c
index 0b2485f..3c3b0df 100644
--- a/arch/mips/kernel/prom.c
+++ b/arch/mips/kernel/prom.c
@@ -47,24 +47,11 @@ void * __init early_init_dt_alloc_memory_arch(u64 size, u64 
align)
        return __alloc_bootmem(size, align, __pa(MAX_DMA_ADDRESS));
 }
 
-int __init early_init_dt_scan_model(unsigned long node,        const char 
*uname,
-                                   int depth, void *data)
-{
-       if (!depth) {
-               char *model = of_get_flat_dt_prop(node, "model", NULL);
-
-               if (model)
-                       mips_set_machine_name(model);
-       }
-       return 0;
-}
-
 void __init __dt_setup_arch(struct boot_param_header *bph)
 {
        if (!early_init_dt_scan(bph))
                return;
 
-       /* try to load the mips machine name */
-       of_scan_flat_dt(early_init_dt_scan_model, NULL);
+       mips_set_machine_name(of_flat_dt_get_machine_name());
 }
 #endif
-- 
1.8.1.2


<Prev in Thread] Current Thread [Next in Thread>