From patchwork Thu Jul 20 15:53:45 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 108402 Delivered-To: patch@linaro.org Received: by 10.140.101.44 with SMTP id t41csp2310031qge; Thu, 20 Jul 2017 08:55:38 -0700 (PDT) X-Received: by 10.101.86.68 with SMTP id m4mr4334764pgs.46.1500566138836; Thu, 20 Jul 2017 08:55:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500566138; cv=none; d=google.com; s=arc-20160816; b=eM6WDvzc7JnjLurIxj79O70u2DA+3Ud0lcrdiaAMz07fATKSpocAZF0P+He4Rk1Tek t8QxmNOTeO76VovSHPgyXi85+Rl+crJAVdK3aiMmu98MFydVk4s8Idab26KZvuXn2EJ3 4HDBZDDXr/86AHoNt+cJ01cwfqMOYj3pWaKzbagiOQQ/y6Bm/a/9ZRz9JurJaHcjycKD sPB0mu94V1DZ3cf5AaolU5DEjyZKW8JvgrRSgHO3/JrEi7KbHDQsIa0DA2rfg/M/TqRx ls2C0Dnbgin4/6IIXVkYQJD3urdd4YRDaakPD38lfaf5OgQ5gdsM1nCslaw0Vn+8/PzX PXfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=gKhKNpoi6ugz7oQ7GLzKmDiMCKexodHeB8L41ukij0g=; b=tAAsl/ZAGtC3qF7NT7/Qfg6jN1iUE0I1S8wYd6foCQjNig+FTlyWv0blfhuhNkkfRo hqub2ofq8pQSSu4CF/4Lst2jIE7WW0eIN65lSomKWDU0JMDw7eNkQKiY99Vlq6YqsjjF COGOgRvNImBqJM7uS26Gh3Pl60OnKfFAomMKRqg4M2DgxMR4HLOTyyMMRNUEdmw7epvy ggnpb/cIwJXRmcWI1PYUeFz9OOtrJU8dqwPRkxbbuYMIQO16NUKPTYYIELcN6jQUciHA MgHwZgt38A03VYAI90hRf2YF4Mc7aswvtoFwHoTcV8bC10QTXV0FRl0NSCAkA7tfnrq/ a3MA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id t207si213331pgb.740.2017.07.20.08.55.38; Thu, 20 Jul 2017 08:55:38 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S936541AbdGTPzf (ORCPT + 25 others); Thu, 20 Jul 2017 11:55:35 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:57034 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934802AbdGTPze (ORCPT ); Thu, 20 Jul 2017 11:55:34 -0400 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 To: Russell King Cc: Arnd Bergmann , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org 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== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk 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 --- 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(-) -- 2.9.0 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