Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b47038e authored by Mark Rutland's avatar Mark Rutland Committed by Ingo Molnar
Browse files

atomics/treewide: Remove redundant atomic_inc_not_zero() definitions 



When atomic_inc_not_zero(v) isn't defined, <linux/atomic.h> will define
it as falling back to atomic_add_unless((v), 1, 0), so there's no need
for arch code to do so.

There should be no functional change as a result of this patch.

Signed-off-by: default avatarMark Rutland <mark.rutland@arm.com>
Reviewed-by: default avatarWill Deacon <will.deacon@arm.com>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: default avatarPalmer Dabbelt <palmer@sifive.com>
Cc: Boqun Feng <boqun.feng@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/lkml/20180621121321.4761-3-mark.rutland@arm.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent bfc18e38

arch/arc/include/asm/atomic.h

+0 −2
Original line number Diff line number Diff line
@@ -336,8 +336,6 @@ ATOMIC_OPS(xor, ^=, CTOP_INST_AXOR_DI_R2_R2_R3) 
	c;								\

})



#define atomic_inc_not_zero(v)		atomic_add_unless((v), 1, 0)



#define atomic_inc(v)			atomic_add(1, v)

#define atomic_dec(v)			atomic_sub(1, v)

arch/hexagon/include/asm/atomic.h

+0 −2
Original line number Diff line number Diff line
@@ -197,8 +197,6 @@ static inline int atomic_fetch_add_unless(atomic_t *v, int a, int u) 
	return __oldval;

}



#define atomic_inc_not_zero(v) atomic_add_unless((v), 1, 0)



#define atomic_inc(v) atomic_add(1, (v))

#define atomic_dec(v) atomic_sub(1, (v))

arch/riscv/include/asm/atomic.h

+0 −9
Original line number Diff line number Diff line
@@ -375,15 +375,6 @@ static __always_inline int atomic64_add_unless(atomic64_t *v, long a, long u) 
}

#endif



/*

 * The extra atomic operations that are constructed from one of the core

 * LR/SC-based operations above.

 */

static __always_inline int atomic_inc_not_zero(atomic_t *v)

{

        return atomic_fetch_add_unless(v, 1, 0);

}



#ifndef CONFIG_GENERIC_ATOMIC64

static __always_inline long atomic64_inc_not_zero(atomic64_t *v)

{