[PATCH] arc: rename arc_timer's TIMER_CTRL_IE to avoid redefinition

Vineet Gupta Vineet.Gupta1 at synopsys.com
Sun Jul 18 16:03:16 PDT 2021


On 7/18/21 1:36 PM, Randy Dunlap wrote:
> There are 2 other clocksource drivers that use the symbol
> (macro/define) TIMER_CTRL_IE (in 3 files). Change the ARC timer
> symbol "TIMER_CTRL_IE" to "TIMER_CTRL_IEN" to resolve the symbol
> collision (redefinition).
>
> In file included from ../drivers/clocksource/timer-integrator-ap.c:17:
> ../drivers/clocksource/timer-sp.h:25: warning: "TIMER_CTRL_IE" redefined
>     25 | #define TIMER_CTRL_IE  (1 << 5) /*   VR */
> ../include/soc/arc/timers.h:20: note: this is the location of the previous definition
>     20 | #define TIMER_CTRL_IE         (1 << 0) /* Interrupt when Count reaches limit */
>
> ../drivers/clocksource/mps2-timer.c:25: warning: "TIMER_CTRL_IE" redefined
>     25 | #define TIMER_CTRL_IE  BIT(3)
> ../include/soc/arc/timers.h:20: note: this is the location of the previous definition
>     20 | #define TIMER_CTRL_IE         (1 << 0) /* Interrupt when Count reaches limit */
>
> In file included from ../drivers/clocksource/timer-sp804.c:24:
> ../drivers/clocksource/timer-sp.h:25: warning: "TIMER_CTRL_IE" redefined
>     25 | #define TIMER_CTRL_IE  (1 << 5) /*   VR */
> ../include/soc/arc/timers.h:20: note: this is the location of the previous definition
>     20 | #define TIMER_CTRL_IE         (1 << 0) /* Interrupt when Count reaches limit */
>
> Fixes: b26c2e3823ba ("ARC: breakout timer include code into separate header")
> Signed-off-by: Randy Dunlap <rdunlap at infradead.org>
> Cc: Vineet Gupta <vgupta at synopsys.com>
> Cc: linux-snps-arc at lists.infradead.org

Acked-by: Vineet Gupta <vgupta at synopsys.com>

Thx,
-Vineet


More information about the linux-snps-arc mailing list