From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753644AbcBWOgU (ORCPT ); Tue, 23 Feb 2016 09:36:20 -0500 Received: from mout.kundenserver.de ([212.227.126.135]:53527 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752706AbcBWOgK (ORCPT ); Tue, 23 Feb 2016 09:36:10 -0500 From: Arnd Bergmann To: Russell King Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , linux-kernel@vger.kernel.org Subject: [PATCH] ARM: rpc: rename RAM_SIZE macro Date: Tue, 23 Feb 2016 15:35:35 +0100 Message-Id: <1456238141-794068-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:HpPblSTOZjTLDud3EZrbsg/l9pGMAzu0Q34w01ShZX+K1CgJEZv EMctdvorFM6CQswwThutlA37InJNicxLD2Gyz/kjR6GXA7NDVfU5sKjjF+yIM96sfSyVaIf Qmk8G9/LEe9O3Upg1ys1ZrBwhCMrL8Ax30UrzPLA1v+/UrRM8kxl84ioxgMoBwNcS/jReo/ TbpEMJmEvxG7Uhxgr2u7A== X-UI-Out-Filterresults: notjunk:1;V01:K0:EIPhbFDEuwY=:VhVsDJHTFKBGQMgMI/RgmV willeFJns3js4dVis22oPrnIL1vnUeIVr49IhdeNrZ4KKFG7akWQtdzsYHUgw/htQrZ4OiLQm ovDWZQcVZCBHYjVAtA4P9NrHl11g574YScR44bPFU3d4AgAICgyx2jSk7WLJzRL+/V0Q/ZMF7 HW3Kt/IwG+3VaGyQ2dDtJGtCekIVEdv0vvOIpTSie7vf0dHRiSe4KKWPRD2YxlZJUB9YwZVD/ RTQb64SVu1/tXmbww1GrJHnDfoJHhEWv/WEjBI7giTqnmv20bsfkPUPlxAfwDzOoKjEDR4Pto FVgvUnXtfQUv8SxqBVztdTzr5fJCIdzPnCtEx/PdEZdb4YELnIy5uMr4MUXImMjuWePMVNy0F ZM/i6ndM1Yt0HKeSvm7ljPWK1k1kyYltfV7rZOYZo/c9iWSdULwPoD++VFk3b51pftRu491Y9 TVjEMk7jtOsYz/4TClFTEaNnsc3FXUsaGkP8w68tGeQTDXZn/RUENgT6PQJAGGfkYrpy0/7Lr cbpW0G0h/VmR0WXq0IHEUF+BYgQYZyOTAg4CUrhSJUdrJGxmIL+d06pne6xeItysY1hTsVhw7 OpChJLMIXzj43NpKDYPFaGcTiUyl8z82FdJGSQmDW1sZyt2BJdhNiF9E5xCVuuuggpY2U4WVA 0j34mahLRxxqsSgrP+qwIuvYr Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- arch/arm/mach-rpc/include/mach/hardware.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-rpc/include/mach/hardware.h b/arch/arm/mach-rpc/include/mach/hardware.h index 257166b21f3d..39459eed2973 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 -- 2.7.0 From mboxrd@z Thu Jan 1 00:00:00 1970 From: arnd@arndb.de (Arnd Bergmann) Date: Tue, 23 Feb 2016 15:35:35 +0100 Subject: [PATCH] ARM: rpc: rename RAM_SIZE macro Message-ID: <1456238141-794068-1-git-send-email-arnd@arndb.de> To: linux-arm-kernel@lists.infradead.org List-Id: linux-arm-kernel.lists.infradead.org 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 --- arch/arm/mach-rpc/include/mach/hardware.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm/mach-rpc/include/mach/hardware.h b/arch/arm/mach-rpc/include/mach/hardware.h index 257166b21f3d..39459eed2973 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 -- 2.7.0