#define hci_dev_test_and_clear_flag(hdev, nr)  test_and_clear_bit((nr), (hdev)->dev_flags)
 #define hci_dev_test_and_change_flag(hdev, nr) test_and_change_bit((nr), (hdev)->dev_flags)
 
-#define hci_dev_clear_volatile_flags(hdev)                     \
-       do {                                                    \
-               hci_dev_clear_flag(hdev, HCI_LE_SCAN);          \
-               hci_dev_clear_flag(hdev, HCI_LE_ADV);           \
-               hci_dev_clear_flag(hdev, HCI_LL_RPA_RESOLUTION);\
-               hci_dev_clear_flag(hdev, HCI_PERIODIC_INQ);     \
-               hci_dev_clear_flag(hdev, HCI_QUALITY_REPORT);   \
+#define hci_dev_clear_volatile_flags(hdev)                             \
+       do {                                                            \
+               hci_dev_clear_flag((hdev), HCI_LE_SCAN);                \
+               hci_dev_clear_flag((hdev), HCI_LE_ADV);                 \
+               hci_dev_clear_flag((hdev), HCI_LL_RPA_RESOLUTION);      \
+               hci_dev_clear_flag((hdev), HCI_PERIODIC_INQ);           \
+               hci_dev_clear_flag((hdev), HCI_QUALITY_REPORT);         \
        } while (0)
 
 #define hci_dev_le_state_simultaneous(hdev) \
-       (!test_bit(HCI_QUIRK_BROKEN_LE_STATES, &hdev->quirks) && \
-        (hdev->le_states[4] & 0x08) && /* Central */ \
-        (hdev->le_states[4] & 0x40) && /* Peripheral */ \
-        (hdev->le_states[3] & 0x10))   /* Simultaneous */
+       (!test_bit(HCI_QUIRK_BROKEN_LE_STATES, &(hdev)->quirks) && \
+        ((hdev)->le_states[4] & 0x08) &&       /* Central */ \
+        ((hdev)->le_states[4] & 0x40) &&       /* Peripheral */ \
+        ((hdev)->le_states[3] & 0x10))         /* Simultaneous */
 
 /* ----- HCI interface to upper protocols ----- */
 int l2cap_connect_ind(struct hci_dev *hdev, bdaddr_t *bdaddr);