Replace the driver-specific thread-safe shared register API by the recently introduced atomic_io_clear_set().
Signed-off-by: Ezequiel Garcia <ezequiel.gar...@free-electrons.com> --- drivers/clocksource/time-orion.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/clocksource/time-orion.c b/drivers/clocksource/time-orion.c index ecbeb68..4334ea7 100644 --- a/drivers/clocksource/time-orion.c +++ b/drivers/clocksource/time-orion.c @@ -35,20 +35,15 @@ #define ORION_ONESHOT_MAX 0xfffffffe static void __iomem *timer_base; -static DEFINE_SPINLOCK(timer_ctrl_lock); /* * Thread-safe access to TIMER_CTRL register * (shared with watchdog timer) */ -void orion_timer_ctrl_clrset(u32 clr, u32 set) +static void orion_timer_ctrl_clrset(u32 clr, u32 set) { - spin_lock(&timer_ctrl_lock); - writel((readl(timer_base + TIMER_CTRL) & ~clr) | set, - timer_base + TIMER_CTRL); - spin_unlock(&timer_ctrl_lock); + atomic_io_clear_set(timer_base + TIMER_CTRL, clr, set); } -EXPORT_SYMBOL(orion_timer_ctrl_clrset); /* * Free-running clocksource handling. -- 1.8.1.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/