]> git.baikalelectronics.ru Git - kernel.git/commit
NIOS2: irqflags: rename a redefined register name
authorRandy Dunlap <rdunlap@infradead.org>
Mon, 4 Oct 2021 07:56:06 +0000 (00:56 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 27 Oct 2021 07:54:25 +0000 (09:54 +0200)
commit1fcac9a6e74dea40eb1f8eaed42cc550ff8aa113
tree620d0724763586673896b870e75b0a721faf4b43
parentb284b319fb8e68b6fab06342f8e52075ecaeae80
NIOS2: irqflags: rename a redefined register name

[ Upstream commit ca2cf27f52352d7b4b07410e6f38a5a1209ea292 ]

Both arch/nios2/ and drivers/mmc/host/tmio_mmc.c define a macro
with the name "CTL_STATUS". Change the one in arch/nios2/ to be
"CTL_FSTATUS" (flags status) to eliminate the build warning.

In file included from ../drivers/mmc/host/tmio_mmc.c:22:
drivers/mmc/host/tmio_mmc.h:31: warning: "CTL_STATUS" redefined
   31 | #define CTL_STATUS 0x1c
arch/nios2/include/asm/registers.h:14: note: this is the location of the previous definition
   14 | #define CTL_STATUS      0

Fixes: 4ad751945215 ("nios2: Nios2 registers")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Signed-off-by: Dinh Nguyen <dinguyen@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/nios2/include/asm/irqflags.h
arch/nios2/include/asm/registers.h