From: Peng Fan <[email protected]>
Convert open-coded if/else with set_bit/clear_bit and their
non-atomic __set_bit/__clear_bit variants to the assign_bit/__assign_bit
API. Where a bit is toggled based on its own value, use change_bit()
instead.
Done with Coccinelle semantic patch:
// set_bit -> clear_bit => assign_bit
@@
expression cond, bit, addr;
@@
-if (cond)
- set_bit(bit, addr);
-else
- clear_bit(bit, addr);
+assign_bit(bit, addr, cond);
// clear_bit -> set_bit => assign_bit
@@
expression cond, bit, addr;
@@
-if (cond)
- clear_bit(bit, addr);
-else
- set_bit(bit, addr);
+assign_bit(bit, addr, !cond);
// __set_bit -> __clear_bit => __assign_bit
@@
expression cond, bit, addr;
@@
-if (cond)
- __set_bit(bit, addr);
-else
- __clear_bit(bit, addr);
+__assign_bit(bit, addr, cond);
// __clear_bit -> __set_bit => __assign_bit
@@
expression cond, bit, addr;
@@
-if (cond)
- __clear_bit(bit, addr);
-else
- __set_bit(bit, addr);
+__assign_bit(bit, addr, !cond);
Signed-off-by: Peng Fan <[email protected]>
---
net/6lowpan/debugfs.c | 10 ++--------
net/bridge/br.c | 5 +----
net/bridge/br_sysfs_if.c | 10 ++--------
net/dsa/tag_ksz.c | 5 +----
net/ncsi/ncsi-rsp.c | 10 ++--------
net/x25/af_x25.c | 5 +----
6 files changed, 9 insertions(+), 36 deletions(-)
diff --git a/net/6lowpan/debugfs.c b/net/6lowpan/debugfs.c
index 600b9563bfc5..d959b132c067 100644
--- a/net/6lowpan/debugfs.c
+++ b/net/6lowpan/debugfs.c
@@ -21,10 +21,7 @@ static int lowpan_ctx_flag_active_set(void *data, u64 val)
if (val != 0 && val != 1)
return -EINVAL;
- if (val)
- set_bit(LOWPAN_IPHC_CTX_FLAG_ACTIVE, &ctx->flags);
- else
- clear_bit(LOWPAN_IPHC_CTX_FLAG_ACTIVE, &ctx->flags);
+ assign_bit(LOWPAN_IPHC_CTX_FLAG_ACTIVE, &ctx->flags, val);
return 0;
}
@@ -46,10 +43,7 @@ static int lowpan_ctx_flag_c_set(void *data, u64 val)
if (val != 0 && val != 1)
return -EINVAL;
- if (val)
- set_bit(LOWPAN_IPHC_CTX_FLAG_COMPRESSION, &ctx->flags);
- else
- clear_bit(LOWPAN_IPHC_CTX_FLAG_COMPRESSION, &ctx->flags);
+ assign_bit(LOWPAN_IPHC_CTX_FLAG_COMPRESSION, &ctx->flags, val);
return 0;
}
diff --git a/net/bridge/br.c b/net/bridge/br.c
index a5e5b2db110e..09a120b3b76c 100644
--- a/net/bridge/br.c
+++ b/net/bridge/br.c
@@ -396,10 +396,7 @@ void br_opt_toggle(struct net_bridge *br, enum
net_bridge_opts opt, bool on)
if (cur == on)
return;
- if (on)
- set_bit(opt, &br->options);
- else
- clear_bit(opt, &br->options);
+ assign_bit(opt, &br->options, on);
}
static void __net_exit br_net_exit_rtnl(struct net *net,
diff --git a/net/bridge/br_sysfs_if.c b/net/bridge/br_sysfs_if.c
index bde731c01e10..b9bcafa7f034 100644
--- a/net/bridge/br_sysfs_if.c
+++ b/net/bridge/br_sysfs_if.c
@@ -64,10 +64,7 @@ static int store_flag(struct net_bridge_port *p, unsigned
long v,
int err;
oflags = flags;
- if (v)
- __set_bit(bitnr, &flags);
- else
- __clear_bit(bitnr, &flags);
+ __assign_bit(bitnr, &flags, v);
if (flags == oflags)
return 0;
@@ -77,10 +74,7 @@ static int store_flag(struct net_bridge_port *p, unsigned
long v,
netdev_err(p->dev, "%s\n", extack._msg);
return err;
}
- if (v)
- set_bit(bitnr, &p->flags);
- else
- clear_bit(bitnr, &p->flags);
+ assign_bit(bitnr, &p->flags, v);
br_port_flags_change(p, BIT(bitnr));
return 0;
}
diff --git a/net/dsa/tag_ksz.c b/net/dsa/tag_ksz.c
index b4d70ba930dc..b0340a7be8c9 100644
--- a/net/dsa/tag_ksz.c
+++ b/net/dsa/tag_ksz.c
@@ -41,10 +41,7 @@ static void ksz_hwtstamp_set_state(struct dsa_switch *ds,
bool on)
{
struct ksz_tagger_private *priv = ksz_tagger_private(ds);
- if (on)
- set_bit(KSZ_HWTS_EN, &priv->state);
- else
- clear_bit(KSZ_HWTS_EN, &priv->state);
+ assign_bit(KSZ_HWTS_EN, &priv->state, on);
}
static void ksz_disconnect(struct dsa_switch *ds)
diff --git a/net/ncsi/ncsi-rsp.c b/net/ncsi/ncsi-rsp.c
index fbd84bc8026a..9c91872a2921 100644
--- a/net/ncsi/ncsi-rsp.c
+++ b/net/ncsi/ncsi-rsp.c
@@ -884,10 +884,7 @@ static int ncsi_rsp_handler_gp(struct ncsi_request *nr)
spin_lock_irqsave(&nc->lock, flags);
bitmap = &ncmf->bitmap;
for (i = 0; i < rsp->mac_cnt; i++, pdata += 6) {
- if (!(enable & (0x1 << i)))
- clear_bit(i, bitmap);
- else
- set_bit(i, bitmap);
+ assign_bit(i, bitmap, enable & (0x1 << i));
memcpy(&ncmf->addrs[i * ETH_ALEN], pdata, ETH_ALEN);
}
@@ -899,10 +896,7 @@ static int ncsi_rsp_handler_gp(struct ncsi_request *nr)
bitmap = &ncvf->bitmap;
spin_lock_irqsave(&nc->lock, flags);
for (i = 0; i < rsp->vlan_cnt; i++, pdata += 2) {
- if (!(enable & (0x1 << i)))
- clear_bit(i, bitmap);
- else
- set_bit(i, bitmap);
+ assign_bit(i, bitmap, enable & (0x1 << i));
ncvf->vids[i] = ntohs(*(__be16 *)pdata);
}
diff --git a/net/x25/af_x25.c b/net/x25/af_x25.c
index 033e7d059f58..f45c9ec7d2c6 100644
--- a/net/x25/af_x25.c
+++ b/net/x25/af_x25.c
@@ -439,10 +439,7 @@ static int x25_setsockopt(struct socket *sock, int level,
int optname,
if (copy_from_sockptr(&opt, optval, sizeof(int)))
goto out;
- if (opt)
- set_bit(X25_Q_BIT_FLAG, &x25_sk(sk)->flags);
- else
- clear_bit(X25_Q_BIT_FLAG, &x25_sk(sk)->flags);
+ assign_bit(X25_Q_BIT_FLAG, &x25_sk(sk)->flags, opt);
rc = 0;
out:
return rc;
--
2.51.0
