NIOS2: irqflags: rename a redefined register name
authorRandy Dunlap <rdunlap@infradead.org>
Mon, 4 Oct 2021 07:56:06 +0000 (00:56 -0700)
committerDinh Nguyen <dinguyen@kernel.org>
Mon, 18 Oct 2021 16:22:59 +0000 (11:22 -0500)
commit4cce60f15c04d69eff6ffc539ab09137dbe15070
tree31b449317f4c094084a47beca1292fb7a3da5cd2
parent519d81956ee277b4419c723adfb154603c2565ba
NIOS2: irqflags: rename a redefined register name

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: b31ebd8055ea ("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>
arch/nios2/include/asm/irqflags.h
arch/nios2/include/asm/registers.h