Bluetooth: Introduce hci_dev_test_flag helper macro

Instead of manually coding test_bit on hdev->dev_flags all the time,
use hci_dev_test_flag helper macro.

Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>

10 files changed, 278 insertions, 278 deletions

diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
index 5cc5a192359d..05e95a75aba5 100644
--- a/include/net/bluetooth/hci_core.h
+++ b/include/net/bluetooth/hci_core.h
@@ -502,6 +502,8 @@ extern struct list_head hci_cb_list;
 extern rwlock_t hci_dev_list_lock;
 extern struct mutex hci_cb_list_lock;
 
+#define hci_dev_test_flag(hdev, nr)   test_bit((nr), &(hdev)->dev_flags)
+
 /* ----- HCI interface to upper protocols ----- */
 int l2cap_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr);
 int l2cap_disconn_ind(struct hci_conn *hcon);
@@ -598,14 +600,14 @@ enum {
 static inline bool hci_conn_ssp_enabled(struct hci_conn *conn)
 {
         struct hci_dev *hdev = conn->hdev;
-        return test_bit(HCI_SSP_ENABLED, &hdev->dev_flags) &&
+        return hci_dev_test_flag(hdev, HCI_SSP_ENABLED) &&
                test_bit(HCI_CONN_SSP_ENABLED, &conn->flags);
 }
 
 static inline bool hci_conn_sc_enabled(struct hci_conn *conn)
 {
         struct hci_dev *hdev = conn->hdev;
-        return test_bit(HCI_SC_ENABLED, &hdev->dev_flags) &&
+        return hci_dev_test_flag(hdev, HCI_SC_ENABLED) &&
                test_bit(HCI_CONN_SC_ENABLED, &conn->flags);
 }
 
@@ -1025,10 +1027,10 @@ void hci_conn_del_sysfs(struct hci_conn *conn);
 #define lmp_host_le_capable(dev)   (!!((dev)->features[1][0] & LMP_HOST_LE))
 #define lmp_host_le_br_capable(dev) (!!((dev)->features[1][0] & LMP_HOST_LE_BREDR))
 
-#define hdev_is_powered(hdev) (test_bit(HCI_UP, &hdev->flags) && \
-                                !test_bit(HCI_AUTO_OFF, &hdev->dev_flags))
-#define bredr_sc_enabled(dev) (lmp_sc_capable(dev) && \
-                               test_bit(HCI_SC_ENABLED, &(dev)->dev_flags))
+#define hdev_is_powered(dev)   (test_bit(HCI_UP, &(dev)->flags) && \
+                                !hci_dev_test_flag(dev, HCI_AUTO_OFF))
+#define bredr_sc_enabled(dev)  (lmp_sc_capable(dev) && \
+                                hci_dev_test_flag(dev, HCI_SC_ENABLED))
 
 /* ----- HCI protocols ----- */
 #define HCI_PROTO_DEFER             0x01
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
index 91ebb9cb31de..5444e194eb4e 100644
--- a/net/bluetooth/hci_conn.c
+++ b/net/bluetooth/hci_conn.c
@@ -571,7 +571,7 @@ struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src)
 
         list_for_each_entry(d, &hci_dev_list, list) {
                 if (!test_bit(HCI_UP, &d->flags) ||
-                    test_bit(HCI_USER_CHANNEL, &d->dev_flags) ||
+                    hci_dev_test_flag(d, HCI_USER_CHANNEL) ||
                     d->dev_type != HCI_BREDR)
                         continue;
 
@@ -734,7 +734,7 @@ struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst,
         int err;
 
         /* Let's make sure that le is enabled.*/
-        if (!test_bit(HCI_LE_ENABLED, &hdev->dev_flags)) {
+        if (!hci_dev_test_flag(hdev, HCI_LE_ENABLED)) {
                 if (lmp_le_capable(hdev))
                         return ERR_PTR(-ECONNREFUSED);
 
@@ -799,7 +799,7 @@ struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst,
          * anyway have to disable it in order to start directed
          * advertising.
          */
-        if (test_bit(HCI_LE_ADV, &hdev->dev_flags)) {
+        if (hci_dev_test_flag(hdev, HCI_LE_ADV)) {
                 u8 enable = 0x00;
                 hci_req_add(&req, HCI_OP_LE_SET_ADV_ENABLE, sizeof(enable),
                             &enable);
@@ -810,7 +810,7 @@ struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst,
                 /* If we're active scanning most controllers are unable
                  * to initiate advertising. Simply reject the attempt.
                  */
-                if (test_bit(HCI_LE_SCAN, &hdev->dev_flags) &&
+                if (hci_dev_test_flag(hdev, HCI_LE_SCAN) &&
                     hdev->le_scan_type == LE_SCAN_ACTIVE) {
                         skb_queue_purge(&req.cmd_q);
                         hci_conn_del(conn);
@@ -840,7 +840,7 @@ struct hci_conn *hci_connect_le(struct hci_dev *hdev, bdaddr_t *dst,
          * handler for scan disabling knows to set the correct discovery
          * state.
          */
-        if (test_bit(HCI_LE_SCAN, &hdev->dev_flags)) {
+        if (hci_dev_test_flag(hdev, HCI_LE_SCAN)) {
                 hci_req_add_le_scan_disable(&req);
                 set_bit(HCI_LE_SCAN_INTERRUPTED, &hdev->dev_flags);
         }
@@ -864,7 +864,7 @@ struct hci_conn *hci_connect_acl(struct hci_dev *hdev, bdaddr_t *dst,
 {
         struct hci_conn *acl;
 
-        if (!test_bit(HCI_BREDR_ENABLED, &hdev->dev_flags)) {
+        if (!hci_dev_test_flag(hdev, HCI_BREDR_ENABLED)) {
                 if (lmp_bredr_capable(hdev))
                         return ERR_PTR(-ECONNREFUSED);
 
@@ -942,7 +942,7 @@ int hci_conn_check_link_mode(struct hci_conn *conn)
          * Connections is used and the link is encrypted with AES-CCM
          * using a P-256 authenticated combination key.
          */
-        if (test_bit(HCI_SC_ONLY, &conn->hdev->flags)) {
+        if (hci_dev_test_flag(conn->hdev, HCI_SC_ONLY)) {
                 if (!hci_conn_sc_enabled(conn) ||
                     !test_bit(HCI_CONN_AES_CCM, &conn->flags) ||
                     conn->key_type != HCI_LK_AUTH_COMBINATION_P256)
diff --git a/net/bluetooth/hci_core.c b/net/bluetooth/hci_core.c
index e3bbdd537b90..20fe5ef6abc5 100644
--- a/net/bluetooth/hci_core.c
+++ b/net/bluetooth/hci_core.c
@@ -617,7 +617,7 @@ static void hci_init2_req(struct hci_request *req, unsigned long opt)
                  */
                 hdev->max_page = 0x01;
 
-                if (test_bit(HCI_SSP_ENABLED, &hdev->dev_flags)) {
+                if (hci_dev_test_flag(hdev, HCI_SSP_ENABLED)) {
                         u8 mode = 0x01;
 
                         hci_req_add(req, HCI_OP_WRITE_SSP_MODE,
@@ -656,7 +656,7 @@ static void hci_init2_req(struct hci_request *req, unsigned long opt)
                             sizeof(cp), &cp);
         }
 
-        if (test_bit(HCI_LINK_SECURITY, &hdev->dev_flags)) {
+        if (hci_dev_test_flag(hdev, HCI_LINK_SECURITY)) {
                 u8 enable = 1;
                 hci_req_add(req, HCI_OP_WRITE_AUTH_ENABLE, sizeof(enable),
                             &enable);
@@ -693,7 +693,7 @@ static void hci_set_le_support(struct hci_request *req)
 
         memset(&cp, 0, sizeof(cp));
 
-        if (test_bit(HCI_LE_ENABLED, &hdev->dev_flags)) {
+        if (hci_dev_test_flag(hdev, HCI_LE_ENABLED)) {
                 cp.le = 0x01;
                 cp.simul = 0x00;