From: alexandre.belloni@free-electrons.com (Alexandre Belloni)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] ARM: at91: avoid defining CONFIG_* symbols in source code
Date: Tue, 1 Mar 2016 09:56:24 +0100 [thread overview]
Message-ID: <20160301085624.GD2627@piout.net> (raw)
In-Reply-To: <1456238384-882646-1-git-send-email-arnd@arndb.de>
On 23/02/2016 at 15:39:38 +0100, Arnd Bergmann wrote :
> 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 <arnd@arndb.de>
> Suggested-by: Russell King <linux@arm.linux.org.uk>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> ---
> arch/arm/include/debug/at91.S | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> 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
> --
> 2.7.0
>
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
WARNING: multiple messages have this Message-ID (diff)
From: Alexandre Belloni <alexandre.belloni@free-electrons.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Nicolas Ferre <nicolas.ferre@atmel.com>,
linux-arm-kernel@lists.infradead.org,
Jean-Christophe Plagniol-Villard <plagnioj@jcrosoft.com>,
Russell King <linux@arm.linux.org.uk>,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] ARM: at91: avoid defining CONFIG_* symbols in source code
Date: Tue, 1 Mar 2016 09:56:24 +0100 [thread overview]
Message-ID: <20160301085624.GD2627@piout.net> (raw)
In-Reply-To: <1456238384-882646-1-git-send-email-arnd@arndb.de>
On 23/02/2016 at 15:39:38 +0100, Arnd Bergmann wrote :
> 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 <arnd@arndb.de>
> Suggested-by: Russell King <linux@arm.linux.org.uk>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>
> ---
> arch/arm/include/debug/at91.S | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> 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
> --
> 2.7.0
>
--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
next prev parent reply other threads:[~2016-03-01 8:56 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-23 14:39 [PATCH] ARM: at91: avoid defining CONFIG_* symbols in source code Arnd Bergmann
2016-02-23 14:39 ` Arnd Bergmann
2016-03-01 8:56 ` Alexandre Belloni [this message]
2016-03-01 8:56 ` Alexandre Belloni
2016-03-02 15:46 ` Nicolas Ferre
2016-03-02 15:46 ` Nicolas Ferre
2016-03-02 16:31 ` Arnd Bergmann
2016-03-02 16:31 ` Arnd Bergmann
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20160301085624.GD2627@piout.net \
--to=alexandre.belloni@free-electrons.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.