github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-11-06 21:58:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Bluetooth: use assign_bit() where applicable

Browse Source 
Convert open-coded if/else with set_bit/clear_bit the assign_bit API.

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);

    @@
    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 <peng.fan@nxp.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
This commit is contained in:
Peng Fan 2026-09-20 10:26:02 +08:00 committed by Luiz Augusto von Dentz
parent 589b80b654
commit c4154fc347
6 changed files with 21 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
net/bluetooth/hci_event.c
View File

@ -404,10 +404,7 @@ static u8 hci_cc_write_auth_enable(struct hci_dev *hdev, void *data,
if (!rp->status) {
__u8 param = *((__u8 *) sent);
if (param == AUTH_ENABLED)
set_bit(HCI_AUTH, &hdev->flags);
else
clear_bit(HCI_AUTH, &hdev->flags);
assign_bit(HCI_AUTH, &hdev->flags, param == AUTH_ENABLED);
}
if (hci_dev_test_flag(hdev, HCI_MGMT))
@ -436,10 +433,7 @@ static u8 hci_cc_write_encrypt_mode(struct hci_dev *hdev, void *data,
param = *((__u8 *) sent);
if (param)
set_bit(HCI_ENCRYPT, &hdev->flags);
else
clear_bit(HCI_ENCRYPT, &hdev->flags);
assign_bit(HCI_ENCRYPT, &hdev->flags, param);
return rp->status;
}
@ -466,15 +460,9 @@ static u8 hci_cc_write_scan_enable(struct hci_dev *hdev, void *data,
goto done;
}
if (param & SCAN_INQUIRY)
set_bit(HCI_ISCAN, &hdev->flags);
else
clear_bit(HCI_ISCAN, &hdev->flags);
assign_bit(HCI_ISCAN, &hdev->flags, param & SCAN_INQUIRY);
if (param & SCAN_PAGE)
set_bit(HCI_PSCAN, &hdev->flags);
else
clear_bit(HCI_PSCAN, &hdev->flags);
assign_bit(HCI_PSCAN, &hdev->flags, param & SCAN_PAGE);
done:
hci_dev_unlock(hdev);
@ -4614,10 +4602,8 @@ static void hci_mode_change_evt(struct hci_dev *hdev, void *data,
if (!test_and_clear_bit(HCI_CONN_MODE_CHANGE_PEND,
&conn->flags)) {
if (conn->mode == HCI_CM_ACTIVE)
set_bit(HCI_CONN_POWER_SAVE, &conn->flags);
else
clear_bit(HCI_CONN_POWER_SAVE, &conn->flags);
assign_bit(HCI_CONN_POWER_SAVE, &conn->flags,
conn->mode == HCI_CM_ACTIVE);
}
if (test_and_clear_bit(HCI_CONN_SCO_SETUP_PEND, &conn->flags))
@ -4817,10 +4803,7 @@ static void hci_link_key_notify_evt(struct hci_dev *hdev, void *data,
goto unlock;
}
if (persistent)
clear_bit(HCI_CONN_FLUSH_KEY, &conn->flags);
else
set_bit(HCI_CONN_FLUSH_KEY, &conn->flags);
assign_bit(HCI_CONN_FLUSH_KEY, &conn->flags, !persistent);
unlock:
hci_dev_unlock(hdev);

15
net/bluetooth/iso.c
View File

@ -1974,10 +1974,7 @@ static int iso_sock_setsockopt(struct socket *sock, int level, int optname,
if (err)
break;
if (opt)
set_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags);
else
clear_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags);
assign_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags, opt);
break;
case BT_PKT_STATUS:
@ -1985,10 +1982,7 @@ static int iso_sock_setsockopt(struct socket *sock, int level, int optname,
if (err)
break;
if (opt)
set_bit(BT_SK_PKT_STATUS, &bt_sk(sk)->flags);
else
clear_bit(BT_SK_PKT_STATUS, &bt_sk(sk)->flags);
assign_bit(BT_SK_PKT_STATUS, &bt_sk(sk)->flags, opt);
break;
case BT_PKT_SEQNUM:
@ -1996,10 +1990,7 @@ static int iso_sock_setsockopt(struct socket *sock, int level, int optname,
if (err)
break;
if (opt)
set_bit(BT_SK_PKT_SEQNUM, &bt_sk(sk)->flags);
else
clear_bit(BT_SK_PKT_SEQNUM, &bt_sk(sk)->flags);
assign_bit(BT_SK_PKT_SEQNUM, &bt_sk(sk)->flags, opt);
break;
case BT_ISO_QOS:

22
net/bluetooth/l2cap_sock.c
View File

@ -867,15 +867,11 @@ static int l2cap_sock_setsockopt_old(struct socket *sock, int optname,
if (opt & L2CAP_LM_SECURE)
chan->sec_level = BT_SECURITY_HIGH;
if (opt & L2CAP_LM_MASTER)
set_bit(FLAG_ROLE_SWITCH, &chan->flags);
else
clear_bit(FLAG_ROLE_SWITCH, &chan->flags);
assign_bit(FLAG_ROLE_SWITCH, &chan->flags,
opt & L2CAP_LM_MASTER);
if (opt & L2CAP_LM_RELIABLE)
set_bit(FLAG_FORCE_RELIABLE, &chan->flags);
else
clear_bit(FLAG_FORCE_RELIABLE, &chan->flags);
assign_bit(FLAG_FORCE_RELIABLE, &chan->flags,
opt & L2CAP_LM_RELIABLE);
break;
default:
@ -1042,10 +1038,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
}
}
if (opt)
set_bit(FLAG_FLUSHABLE, &chan->flags);
else
clear_bit(FLAG_FLUSHABLE, &chan->flags);
assign_bit(FLAG_FLUSHABLE, &chan->flags, opt);
break;
case BT_POWER:
@ -1061,10 +1054,7 @@ static int l2cap_sock_setsockopt(struct socket *sock, int level, int optname,
if (err)
break;
if (pwr.force_active)
set_bit(FLAG_FORCE_ACTIVE, &chan->flags);
else
clear_bit(FLAG_FORCE_ACTIVE, &chan->flags);
assign_bit(FLAG_FORCE_ACTIVE, &chan->flags, pwr.force_active);
break;
case BT_CHANNEL_POLICY:

6
net/bluetooth/rfcomm/core.c
View File

@ -1740,10 +1740,8 @@ static int rfcomm_recv_msc(struct rfcomm_session *s, int cr, struct sk_buff *skb
return 0;
if (cr) {
if (msc->v24_sig & RFCOMM_V24_FC && !d->cfc)
set_bit(RFCOMM_TX_THROTTLED, &d->flags);
else
clear_bit(RFCOMM_TX_THROTTLED, &d->flags);
assign_bit(RFCOMM_TX_THROTTLED, &d->flags,
msc->v24_sig & RFCOMM_V24_FC && !d->cfc);
rfcomm_dlc_lock(d);

5
net/bluetooth/rfcomm/sock.c
View File

@ -724,10 +724,7 @@ static int rfcomm_sock_setsockopt(struct socket *sock, int level, int optname,
if (err)
break;
if (opt)
set_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags);
else
clear_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags);
assign_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags, opt);
break;

10
net/bluetooth/sco.c
View File

@ -1037,10 +1037,7 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname,
if (err)
break;
if (opt)
set_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags);
else
clear_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags);
assign_bit(BT_SK_DEFER_SETUP, &bt_sk(sk)->flags, opt);
break;
case BT_VOICE:
@ -1080,10 +1077,7 @@ static int sco_sock_setsockopt(struct socket *sock, int level, int optname,
if (err)
break;
if (opt)
set_bit(BT_SK_PKT_STATUS, &bt_sk(sk)->flags);
else
clear_bit(BT_SK_PKT_STATUS, &bt_sk(sk)->flags);
assign_bit(BT_SK_PKT_STATUS, &bt_sk(sk)->flags, opt);
break;
case BT_CODEC: