Commit 4cce60f1 authored by Randy Dunlap's avatar Randy Dunlap Committed by Dinh Nguyen

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: b31ebd80 ("nios2: Nios2 registers")
Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Cc: Dinh Nguyen <dinguyen@kernel.org>
Signed-off-by: default avatarDinh Nguyen <dinguyen@kernel.org>
parent 519d8195
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
static inline unsigned long arch_local_save_flags(void) static inline unsigned long arch_local_save_flags(void)
{ {
return RDCTL(CTL_STATUS); return RDCTL(CTL_FSTATUS);
} }
/* /*
...@@ -18,7 +18,7 @@ static inline unsigned long arch_local_save_flags(void) ...@@ -18,7 +18,7 @@ static inline unsigned long arch_local_save_flags(void)
*/ */
static inline void arch_local_irq_restore(unsigned long flags) static inline void arch_local_irq_restore(unsigned long flags)
{ {
WRCTL(CTL_STATUS, flags); WRCTL(CTL_FSTATUS, flags);
} }
static inline void arch_local_irq_disable(void) static inline void arch_local_irq_disable(void)
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#endif #endif
/* control register numbers */ /* control register numbers */
#define CTL_STATUS 0 #define CTL_FSTATUS 0
#define CTL_ESTATUS 1 #define CTL_ESTATUS 1
#define CTL_BSTATUS 2 #define CTL_BSTATUS 2
#define CTL_IENABLE 3 #define CTL_IENABLE 3
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment