From patchwork Tue Feb 23 14:39:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 102692 Delivered-To: patch@linaro.org Received: by 10.112.43.199 with SMTP id y7csp1867862lbl; Tue, 23 Feb 2016 06:43:03 -0800 (PST) X-Received: by 10.66.63.104 with SMTP id f8mr46691887pas.109.1456238583210; Tue, 23 Feb 2016 06:43:03 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id vs7si38464892pab.234.2016.02.23.06.43.02; Tue, 23 Feb 2016 06:43:03 -0800 (PST) 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 S1753243AbcBWOnA (ORCPT + 30 others); Tue, 23 Feb 2016 09:43:00 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:52866 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752678AbcBWOm7 (ORCPT ); Tue, 23 Feb 2016 09:42:59 -0500 Received: from wuerfel.lan. ([78.42.132.4]) by mrelayeu.kundenserver.de (mreue104) with ESMTPA (Nemesis) id 0MMWL8-1aZsYH2QW6-008GD8; Tue, 23 Feb 2016 15:39:47 +0100 From: Arnd Bergmann To: Nicolas Ferre , Alexandre Belloni Cc: linux-arm-kernel@lists.infradead.org, Arnd Bergmann , Jean-Christophe Plagniol-Villard , Russell King , linux-kernel@vger.kernel.org Subject: [PATCH] ARM: at91: avoid defining CONFIG_* symbols in source code Date: Tue, 23 Feb 2016 15:39:38 +0100 Message-Id: <1456238384-882646-1-git-send-email-arnd@arndb.de> X-Mailer: git-send-email 2.7.0 X-Provags-ID: V03:K0:ytO0UU/oGtGkfShhDIsJ2msUsF6p9y8Lrx7RXBOBV2xU/vmJKne a1Ol7KR8n4jetzBBgFdNT/V0yzeAZT/P7CaWvTd+DFOy6arR3v4+7Q4/4wS9z5ygu6XOO92 c7qTcNzbywJD/h/P5yLBz2/EzaBuQN85MNlhs2nyF0DJEXGNtWaU+NZBynH98qXNbqhWo/e 7rdpBbDT+7bTCvUy4qLKQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:cWfUJQ1uk2w=:pdPy/atXuyUhWk8+UGckO1 rxb3vWtRzvITHG83FKORAfPuXl2A2xxvC4OCJAUML8vkLaqC0j0mVFJpsXxl8/ua7E3TGHZhU OdiegHoEj3sJLW0HzC3EbhEDPvPjfVmfLCXKsFnz/sAF7EW6x7QyszJvLI2LqOURwYJsXVPRd gKmstCXBA57lRMt5Ul/+QNL+BuFz06ypAmOrSfF6JxHu20kxmBGAmMANRvi9OIkKdsl96yMtF w1BLfpGBSD3DWkObu9yxdmDpCo8Nht4hfDUxuCW6FzqOT2Prl2EnLhaYJyCTRCOIFJ3akekzY zvnRJ4KheXrDjiSO2aGc1Ui7lDuvsHsWzMF5BrjUKDAv1599+Tm3jQRZhILYRm+jfp+NRp1VP CbWzJN2lDc/NmqP/6SKSmWRgMd5YdOLJILhBzUsC23M+qBC2GKjjy33vqnWAID6up4Jqg10Tk oO7GnQvvUXEgESFX1Z4/3xYe30JZWxbBgRK+zb2dN5PCWTtaMU/x+v7QmY9snG5NtBm2U6mfO 3HF/mOBZoWizKwjEm8f94IblCK6z695CDoz838vDJrQeYkUxfaabGJmdO6ePp0UO/rx8+p/wq 3LiVYMeVojx3QY3ZUeuzOr1DkY5DV3AuQfaWBAysFzNZV3D8ycsWz/KkJpvigoXvUnCfNBCkk hhDYPgwRGYPvnp5McCx+2cEYVK8lsFPWzDogLdhzqLmwbIyDgWD1ATOaWvAQJTXTSSY0= Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In an invalid randconfig build (fixed by another patch), I ran across this warning: arch/arm/include/debug/at91.S:18:0: error: "CONFIG_DEBUG_UART_VIRT" redefined [-Werror] #define CONFIG_DEBUG_UART_VIRT AT91_IO_P2V(CONFIG_DEBUG_UART_PHYS) As Russell pointed out, we should never #define a macro starting with CONFIG_ in a source file, as that is rather confusing. This renames the macro to avoid the symbol clash. Signed-off-by: Arnd Bergmann Suggested-by: Russell King --- arch/arm/include/debug/at91.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.7.0 diff --git a/arch/arm/include/debug/at91.S b/arch/arm/include/debug/at91.S index 43243be94cfc..d4ae3b8e2426 100644 --- a/arch/arm/include/debug/at91.S +++ b/arch/arm/include/debug/at91.S @@ -15,7 +15,7 @@ #define AT91_IO_P2V(x) (x) #endif -#define CONFIG_DEBUG_UART_VIRT AT91_IO_P2V(CONFIG_DEBUG_UART_PHYS) +#define AT91_DEBUG_UART_VIRT AT91_IO_P2V(CONFIG_DEBUG_UART_PHYS) #define AT91_DBGU_SR (0x14) /* Status Register */ #define AT91_DBGU_THR (0x1c) /* Transmitter Holding Register */ @@ -24,7 +24,7 @@ .macro addruart, rp, rv, tmp ldr \rp, =CONFIG_DEBUG_UART_PHYS @ System peripherals (phys address) - ldr \rv, =CONFIG_DEBUG_UART_VIRT @ System peripherals (virt address) + ldr \rv, =AT91_DEBUG_UART_VIRT @ System peripherals (virt address) .endm .macro senduart,rd,rx