From mboxrd@z Thu Jan 1 00:00:00 1970 Received: with ECARTIS (v1.0.0; list linux-mips); Tue, 17 Sep 2013 06:32:59 +0200 (CEST) Received: from nbd.name ([46.4.11.11]:46048 "EHLO nbd.name" rhost-flags-OK-OK-OK-OK) by eddie.linux-mips.org with ESMTP id S6816841Ab3IQEcxKsUme (ORCPT ); Tue, 17 Sep 2013 06:32:53 +0200 Message-ID: <5237DB62.2060303@phrozen.org> Date: Tue, 17 Sep 2013 06:32:34 +0200 From: John Crispin User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.12) Gecko/20130116 Icedove/10.0.12 MIME-Version: 1.0 To: Rob Herring CC: linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, Grant Likely , Rob Herring , Ralf Baechle , linux-mips@linux-mips.org Subject: Re: [PATCH 28/28] mips: use common of_flat_dt_get_machine_name References: <1379372965-22359-1-git-send-email-robherring2@gmail.com> <1379372965-22359-29-git-send-email-robherring2@gmail.com> In-Reply-To: <1379372965-22359-29-git-send-email-robherring2@gmail.com> Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-Path: X-Envelope-To: <"|/home/ecartis/ecartis -s linux-mips"> (uid 0) X-Orcpt: rfc822;linux-mips@linux-mips.org Original-Recipient: rfc822;linux-mips@linux-mips.org X-archive-position: 37821 X-ecartis-version: Ecartis v1.0.0 Sender: linux-mips-bounce@linux-mips.org Errors-to: linux-mips-bounce@linux-mips.org X-original-sender: john@phrozen.org Precedence: bulk List-help: List-unsubscribe: List-software: Ecartis version 1.0.0 List-Id: linux-mips X-List-ID: linux-mips List-subscribe: List-owner: List-post: List-archive: X-list: linux-mips On 17/09/13 01:09, Rob Herring wrote: > From: Rob Herring > > Convert mips to use the common of_flat_dt_get_machine_name function. > > Signed-off-by: Rob Herring > Cc: Ralf Baechle > Cc: linux-mips@linux-mips.org > --- Acked-by: John Crispin Thanks for this series ... > 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 From mboxrd@z Thu Jan 1 00:00:00 1970 From: John Crispin Subject: Re: [PATCH 28/28] mips: use common of_flat_dt_get_machine_name Date: Tue, 17 Sep 2013 06:32:34 +0200 Message-ID: <5237DB62.2060303@phrozen.org> References: <1379372965-22359-1-git-send-email-robherring2@gmail.com> <1379372965-22359-29-git-send-email-robherring2@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1379372965-22359-29-git-send-email-robherring2-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org> Sender: devicetree-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Rob Herring Cc: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Grant Likely , Rob Herring , Ralf Baechle , linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org List-Id: devicetree@vger.kernel.org On 17/09/13 01:09, Rob Herring wrote: > From: Rob Herring > > Convert mips to use the common of_flat_dt_get_machine_name function. > > Signed-off-by: Rob Herring > Cc: Ralf Baechle > Cc: linux-mips-6z/3iImG2C8G8FEW9MqTrA@public.gmane.org > --- Acked-by: John Crispin Thanks for this series ... > 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 -- To unsubscribe from this list: send the line "unsubscribe devicetree" in the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org More majordomo info at http://vger.kernel.org/majordomo-info.html