From patchwork Sun Jan 4 01:47:52 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julian Calaby X-Patchwork-Id: 16433 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id CBB8BDE112 for ; Sun, 4 Jan 2009 12:58:16 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1750849AbZADB6Q (ORCPT ); Sat, 3 Jan 2009 20:58:16 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1750883AbZADB6Q (ORCPT ); Sat, 3 Jan 2009 20:58:16 -0500 Received: from outbound.icp-qv1-irony-out4.iinet.net.au ([203.59.1.150]:43017 "EHLO outbound.icp-qv1-irony-out4.iinet.net.au" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750849AbZADB6P (ORCPT ); Sat, 3 Jan 2009 20:58:15 -0500 X-Greylist: delayed 606 seconds by postgrey-1.27 at vger.kernel.org; Sat, 03 Jan 2009 20:58:15 EST X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AvoBAB+kX0l8qEn0/2dsb2JhbAAIjFFVsHeLMIVy X-IronPort-AV: E=Sophos;i="4.36,324,1228057200"; d="scan'208";a="296584928" Received: from unknown (HELO [192.168.2.115]) ([124.168.73.244]) by outbound.icp-qv1-irony-out4.iinet.net.au with ESMTP; 04 Jan 2009 10:48:05 +0900 Message-ID: <49601548.509@gmail.com> Date: Sun, 04 Jan 2009 12:47:52 +1100 From: Julian Calaby User-Agent: Mozilla-Thunderbird 2.0.0.17 (X11/20081018) MIME-Version: 1.0 To: sparclinux@vger.kernel.org Subject: [PATCH] sparc: Clean arch-specific code in prom_common.c Sender: sparclinux-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: sparclinux@vger.kernel.org sparc: Clean arch-specific code in prom_common.c prom_nextprop() and prom_firstprop() have slightly different calling conventions in 32 and 64 bit SPARC. prom_common.c uses a ifdef guard to ensure that these functions are called correctly. Adjust code to eliminate this ifdef by using a calling convention that is compatible with both 32 and 64 bit SPARC. Signed-off-by: Julian Calaby Reviewed-by: Sam Ravnborg --- This has been build tested on sparc64 native, however I'm yet to boot it. It hasn't been checked with sparc32 as I lack a working build environment. arch/sparc/kernel/prom_common.c | 14 +++----------- 1 files changed, 3 insertions(+), 11 deletions(-) return NULL; -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/sparc/kernel/prom_common.c b/arch/sparc/kernel/prom_common.c index 4e9af59..ff7b591 100644 --- a/arch/sparc/kernel/prom_common.c +++ b/arch/sparc/kernel/prom_common.c @@ -155,20 +155,12 @@ static struct property * __init build_one_prop(phandle node, char *prev, p->value = prom_early_alloc(special_len); memcpy(p->value, special_val, special_len); } else { -#ifdef CONFIG_SPARC32 - if (prev == NULL) { - name = prom_firstprop(node, NULL); - } else { - name = prom_nextprop(node, prev, NULL); - } -#else if (prev == NULL) { - prom_firstprop(node, p->name); + name = prom_firstprop(node, p->name); } else { - prom_nextprop(node, prev, p->name); + name = prom_nextprop(node, prev, p->name); } - name = p->name; -#endif + if (strlen(name) == 0) { tmp = p;