From: Mark Rutland <mark.rutland@arm.com>
To: mingo@kernel.org, will.deacon@arm.com, peterz@infradead.org,
linux-kernel@vger.kernel.org
Cc: Mark Rutland <mark.rutland@arm.com>, Boqun Feng <boqun.feng@gmail.com>
Subject: [PATCHv4 02/18] atomics/treewide: remove redundant atomic_inc_not_zero() definitions
Date: Thu, 21 Jun 2018 13:13:05 +0100 [thread overview]
Message-ID: <20180621121321.4761-3-mark.rutland@arm.com> (raw)
In-Reply-To: <20180621121321.4761-1-mark.rutland@arm.com>
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: Mark Rutland <mark.rutland@arm.com>
Acked-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Palmer Dabbelt <palmer@sifive.com>
Reviewed-by: Will Deacon <will.deacon@arm.com>
Cc: Boqun Feng <boqun.feng@gmail.com>
---
arch/arc/include/asm/atomic.h | 2 --
arch/hexagon/include/asm/atomic.h | 2 --
arch/riscv/include/asm/atomic.h | 9 ---------
3 files changed, 13 deletions(-)
diff --git a/arch/arc/include/asm/atomic.h b/arch/arc/include/asm/atomic.h
index 67121b5ff3a3..cecdf3403caf 100644
--- a/arch/arc/include/asm/atomic.h
+++ b/arch/arc/include/asm/atomic.h
@@ -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)
diff --git a/arch/hexagon/include/asm/atomic.h b/arch/hexagon/include/asm/atomic.h
index 287aa9f394f3..d2feeba93c44 100644
--- a/arch/hexagon/include/asm/atomic.h
+++ b/arch/hexagon/include/asm/atomic.h
@@ -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))
diff --git a/arch/riscv/include/asm/atomic.h b/arch/riscv/include/asm/atomic.h
index 739e810c857e..0e27e050ba14 100644
--- a/arch/riscv/include/asm/atomic.h
+++ b/arch/riscv/include/asm/atomic.h
@@ -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)
{
--
2.11.0
next prev parent reply other threads:[~2018-06-21 12:17 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-21 12:13 [PATCHv4 00/18] atomics: API cleanups Mark Rutland
2018-06-21 12:13 ` [PATCHv4 01/18] atomics/treewide: s/__atomic_add_unless/atomic_fetch_add_unless/ Mark Rutland
2018-06-21 12:13 ` Mark Rutland [this message]
2018-06-21 12:13 ` [PATCHv4 03/18] atomics/treewide: remove atomic_inc_not_zero_hint() Mark Rutland
2018-06-21 12:13 ` [PATCHv4 04/18] atomics: make conditional ops return bool Mark Rutland
2018-06-21 12:13 ` [PATCHv4 05/18] atomics/treewide: make atomic64_inc_not_zero() optional Mark Rutland
2018-06-21 12:13 ` [PATCHv4 06/18] atomics/treewide: make atomic_fetch_add_unless() optional Mark Rutland
2018-06-21 12:13 ` [PATCHv4 07/18] atomics: prepare for atomic64_fetch_add_unless() Mark Rutland
2018-06-21 12:13 ` [PATCHv4 08/18] atomics/generic: define atomic64_fetch_add_unless() Mark Rutland
2018-06-21 12:21 ` Mark Rutland
2018-06-21 12:26 ` Ingo Molnar
2018-06-21 12:13 ` [PATCHv4 09/18] atomics/alpha: " Mark Rutland
2018-06-21 12:13 ` [PATCHv4 10/18] atomics/arc: " Mark Rutland
2018-06-21 12:13 ` [PATCHv4 11/18] atomics/arm: " Mark Rutland
2018-06-21 12:13 ` [PATCHv4 12/18] atomics/powerpc: " Mark Rutland
2018-06-21 12:13 ` [PATCHv4 13/18] atomics/riscv: " Mark Rutland
2018-06-21 12:13 ` [PATCHv4 14/18] atomics/treewide: make atomic64_fetch_add_unless() optional Mark Rutland
2018-06-21 12:13 ` [PATCHv4 15/18] atomics/treewide: make test ops optional Mark Rutland
2018-06-21 12:13 ` [PATCHv4 16/18] atomics/treewide: make unconditional inc/dec " Mark Rutland
2018-06-21 12:13 ` [PATCHv4 17/18] atomics/treewide: make conditional " Mark Rutland
2018-06-21 12:13 ` [PATCHv4 18/18] atomics/treewide: clean up andnot ifdeffery Mark Rutland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180621121321.4761-3-mark.rutland@arm.com \
--to=mark.rutland@arm.com \
--cc=boqun.feng@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.org \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).