From 4bc0a34c94094d9e896c5a2f45b54d8be6c0fca7 Mon Sep 17 00:00:00 2001 From: Markus Fritsche Date: Thu, 7 May 2026 21:19:49 +0200 Subject: [PATCH 22/29] bes2600: replace a set of atomic_add() Backport of cw1200 mainline commit 07f995ca1951 ("cw1200: replace a set of atomic_add()", 2020-11-10). atomic_inc() reads more naturally than atomic_add(1, &x). Mechanical change, no functional impact. 7 sites: 6 in bh.c (bh_term, bh_rx x2, bh_tx x3) and 1 in itp.c (awaiting_confirm). Two of the bh_rx and three of the bh_tx sites are inside the cw1200-ancestor #if 0 block; replaced anyway to keep the file consistent with cw1200 mainline source style. Cherry-picked from upstream Linux: 07f995ca1951 cw1200: replace a set of atomic_add() Author: Yejune Deng Signed-off-by: Kalle Valo Link: https://lore.kernel.org/r/1604991491-27908-1-git-send-email-yejune.deng@gmail.com --- bes2600/bh.c | 12 ++++++------ bes2600/itp.c | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/staging/bes2600/bh.c b/drivers/staging/bes2600/bh.c index 6385312..1d2773c 100644 --- a/drivers/staging/bes2600/bh.c +++ b/drivers/staging/bes2600/bh.c @@ -101,7 +101,7 @@ void bes2600_unregister_bh(struct bes2600_common *hw_priv) coex_deinit_mode(hw_priv); #endif - atomic_add(1, &hw_priv->bh_term); + atomic_inc(&hw_priv->bh_term); wake_up(&hw_priv->bh_wq); flush_workqueue(hw_priv->bh_workqueue); @@ -590,7 +590,7 @@ static int bes2600_bh(void *arg) bes_devel("[BH] Device resume.\n"); atomic_set(&hw_priv->bh_suspend, BES2600_BH_RESUMED); wake_up(&hw_priv->bh_evt_wq); - atomic_add(1, &hw_priv->bh_rx); + atomic_inc(&hw_priv->bh_rx); continue; } @@ -758,9 +758,9 @@ tx: #if 0 /* count is not implemented */ if (ret > 1) - atomic_add(1, &hw_priv->bh_tx); + atomic_inc(&hw_priv->bh_tx); #else - atomic_add(1, &hw_priv->bh_tx); + atomic_inc(&hw_priv->bh_tx); #endif #if defined(CONFIG_BES2600_NON_POWER_OF_TWO_BLOCKSIZES) @@ -1134,7 +1134,7 @@ static int bes2600_bh_tx_helper(struct bes2600_common *hw_priv, tx_len += 4; #endif - atomic_add(1, &hw_priv->bh_tx); + atomic_inc(&hw_priv->bh_tx); tx_len = hw_priv->sbus_ops->align_size( hw_priv->sbus_priv, tx_len); @@ -1435,7 +1435,7 @@ static int bes2600_bh(void *arg) bes_devel("[BH] Device resume.\n"); atomic_set(&hw_priv->bh_suspend, BES2600_BH_RESUMED); wake_up(&hw_priv->bh_evt_wq); - atomic_add(1, &hw_priv->bh_rx); + atomic_inc(&hw_priv->bh_rx); goto done; } diff --git a/drivers/staging/bes2600/itp.c b/drivers/staging/bes2600/itp.c index e5c2958..c50b29c 100644 --- a/drivers/staging/bes2600/itp.c +++ b/drivers/staging/bes2600/itp.c @@ -570,7 +570,7 @@ int bes2600_itp_get_tx(struct bes2600_common *priv, u8 **data, *burst = 2; atomic_set(&priv->bh_tx, 1); ktime_get_ts(&itp->last_sent); - atomic_add(1, &itp->awaiting_confirm); + atomic_inc(&itp->awaiting_confirm); spin_unlock_bh(&itp->tx_lock); return 1; -- 2.54.0