Message ID | 20170720155410.3251043-3-arnd@arndb.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show
Return-Path: <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 285F360392 for <patchwork-linux-arm@patchwork.kernel.org>; Thu, 20 Jul 2017 16:03:20 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 189D626BE9 for <patchwork-linux-arm@patchwork.kernel.org>; Thu, 20 Jul 2017 16:03:20 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0D6E527F85; Thu, 20 Jul 2017 16:03:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id BEF2E26BE9 for <patchwork-linux-arm@patchwork.kernel.org>; Thu, 20 Jul 2017 16:03:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=cCvG9cmZ3NyDrIh65In15mLW3aJmtPKl04dzQJ3iF24=; b=NlnAUWQIu6TptmKAbpcauKviEW 7xkqgLxafS4/Cb3obGT7i8KOFSUy1LfIgdTm6q4/5EU5H8sJ6vIuQs6He2MTyqzn4bhrkw5spfnNQ ev6DHh91Do9+/upv8Ku8Ora8rMwItemvaolz9Uy5j/lE2ydDrjQugCyjWXT30LXbJnnkVmH/ApCbK CTTgy9vtRQO3/cSrJ060I6IX3cOWvHmLAQAQ4T3pP25k/+7va1sEAAxPR8OPzQaghxreidSg1R/J7 Dza5nsPTPl9t/KBKTULhjRkHGtZtgJqR3KNbYQTUeQvMOPaHVxEaL43xqxmUZibySop6ID5WiBgFD Nw7PDv3w==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1dYDv5-0006NU-9G; Thu, 20 Jul 2017 16:03:19 +0000 Received: from mout.kundenserver.de ([217.72.192.75]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1dYDn5-0001dp-O4 for linux-arm-kernel@lists.infradead.org; Thu, 20 Jul 2017 15:55:32 +0000 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue102 [212.227.15.145]) with ESMTPA (Nemesis) id 0LjJi3-1eBQ1W1smV-00dXF2; Thu, 20 Jul 2017 17:54:41 +0200 From: Arnd Bergmann <arnd@arndb.de> To: Russell King <linux@armlinux.org.uk> Subject: [PATCH 12/12] ARM: rpc: rename RAM_SIZE macro Date: Thu, 20 Jul 2017 17:53:45 +0200 Message-Id: <20170720155410.3251043-3-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170720154616.3250481-1-arnd@arndb.de> References: <20170720154616.3250481-1-arnd@arndb.de> X-Provags-ID: V03:K0:BJu2VtNORP02mTgPy0kKk4+9lFo6eFeWBc4rJahZxT1geb0i71U HwJlJig2vImOxwTXrudbZ6vnfZPtlELa8rJLM1Pu85iZnKGTWr3RNcZXqpspzaFoNyyjSmg h+ArCKc9OfNMKLde6/GaVGzE5DSR69NXXkko1UMK5rljAA0nHqXf+W2dYZxW870QvmjWmjt Pv6C2AkPtIFWRg7ouTXXw== X-UI-Out-Filterresults: notjunk:1; V01:K0:rGPG7D7c57I=:+VGefJ1a2EX5LlzGuEV81Y l4Vbj/waZVVIWQdf7KkwVxevFqSpxgyyOFlVkWhfBAYWk16nEE1GWwyDsdeOMNfgrlKZCY7Gq uxf+wNEClZ14iqbamG5BEu7Nyr9D63+iBtbGoTpDk5tgggq68YY/OopE90cptFkp2AXOdGGBt YyxfO7si9vKcKvS33t3VlfBBC3Zi8Azf+5f/5J1jgjWKzsWkBZPKK+9G8c6YZjPMzdaFkDVV8 E5SoLq7/iKRGSGvA7jbYWSFxtxM9ZkwQ2o7JQNw/eev5JF114T61uymj+FVR0qs4/m0ANN/kA kzT9nISokX3aWR4mAg08+BtzoJhKJmnSiU2XMnLhfsY3wmLnQHe9s1E2EIwIjTrxL96cC7ngR utRQAJdz7gZa8TjchMbhRTDewQ5wmRO16Yz/eVJP3oLApN1Nrf/Z+ynmDd0gWciEqpVdvCggj CwbLior5+oCTxAO2O6b9jiZpo58Y4YsPKDV+Ogs6LkxyoQ9swAYbAdL2/THBh2MLQKB8CoTJe WtbvirQFZW8Q+h0T+0Z+44iB8kQqdiSM3LetTCjc1ax7fBYOVjnF//EPKU/bcqfbJbKw63+bW MdFtnQzKKfbc9eRb7PcmrJkIQClA1k/aebc7p3yY7lc3GpnxTSX9+KfRnxksjZSlqDC18D6O/ bsSA7c1dqUcNxddZc0QceB1q2NCeeW31Ix9bGGGWGBjJmcw9IUYQ62ZIlpPFg6ie6nXC3wNE4 fFgOIJEX7EmX/lUFmXlgmOBN9MviPKbhec4qYg== X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170720_085504_808347_8238A709 X-CRM114-Status: GOOD ( 13.54 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: <linux-arm-kernel.lists.infradead.org> List-Unsubscribe: <http://lists.infradead.org/mailman/options/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe> List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/> List-Post: <mailto:linux-arm-kernel@lists.infradead.org> List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help> List-Subscribe: <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>, <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe> Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann <arnd@arndb.de>, linux-kernel@vger.kernel.org MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org> Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP |
diff --git a/arch/arm/mach-rpc/include/mach/hardware.h b/arch/arm/mach-rpc/include/mach/hardware.h index aa79fa47373a..622d4e5df029 100644 --- a/arch/arm/mach-rpc/include/mach/hardware.h +++ b/arch/arm/mach-rpc/include/mach/hardware.h @@ -25,8 +25,8 @@ * *_SIZE is the size of the region * *_BASE is the virtual address */ -#define RAM_SIZE 0x10000000 -#define RAM_START 0x10000000 +#define RPC_RAM_SIZE 0x10000000 +#define RPC_RAM_START 0x10000000 #define EASI_SIZE 0x08000000 /* EASI I/O */ #define EASI_START 0x08000000
The RAM_SIZE macro in mach/hardware.h conflicts with macros of the same name in multiple drivers, leading to annoying build warnings: In file included from drivers/net/ethernet/cirrus/cs89x0.c:79:0: drivers/net/ethernet/cirrus/cs89x0.h:324:0: error: "RAM_SIZE" redefined [-Werror] #define RAM_SIZE 0x1000 /* The card has 4k bytes or RAM */ ^ In file included from /git/arm-soc/arch/arm/mach-rpc/include/mach/io.h:16:0, from /git/arm-soc/arch/arm/include/asm/io.h:194, from /git/arm-soc/include/linux/scatterlist.h:8, from /git/arm-soc/include/linux/dmaengine.h:24, from /git/arm-soc/include/linux/netdevice.h:38, from /git/arm-soc/drivers/net/ethernet/cirrus/cs89x0.c:54: arch/arm/mach-rpc/include/mach/hardware.h:28:0: note: this is the location of the previous definition #define RAM_SIZE 0x10000000 We don't use RAM_SIZE/RAM_START at all, so we could just remove them, but it might be nice to leave them for documentation purposes, so this renames them to RPC_RAM_SIZE/RPC_RAM_START in order to avoid the build warnings Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- I originally sent this in Feb 2016, but it got lost for some reason. --- arch/arm/mach-rpc/include/mach/hardware.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)