Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a358dc11 authored by Marcel Holtmann's avatar Marcel Holtmann Committed by Johan Hedberg
Browse files

Bluetooth: Introduce hci_dev_clear_flag helper macro 



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

Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarJohan Hedberg <johan.hedberg@intel.com>
parent a1536da2

include/net/bluetooth/hci_core.h

+1 −0
Original line number Diff line number Diff line
@@ -503,6 +503,7 @@ extern rwlock_t hci_dev_list_lock; 
extern struct mutex hci_cb_list_lock;



#define hci_dev_set_flag(hdev, nr)    set_bit((nr), &(hdev)->dev_flags)

#define hci_dev_clear_flag(hdev, nr)  clear_bit((nr), &(hdev)->dev_flags)

#define hci_dev_test_flag(hdev, nr)   test_bit((nr), &(hdev)->dev_flags)



/* ----- HCI interface to upper protocols ----- */

net/bluetooth/hci_conn.c

+1 −1
Original line number Diff line number Diff line
@@ -700,7 +700,7 @@ static void hci_req_directed_advertising(struct hci_request *req, 
	 * and write a new random address. The flag will be set back on

	 * as soon as the SET_ADV_ENABLE HCI command completes.

	 */

	clear_bit(HCI_LE_ADV, &hdev->dev_flags);

	hci_dev_clear_flag(hdev, HCI_LE_ADV);



	/* Set require_privacy to false so that the remote device has a

	 * chance of identifying us.

net/bluetooth/hci_core.c

+6 −6
Original line number Diff line number Diff line
@@ -591,7 +591,7 @@ static void hci_init2_req(struct hci_request *req, unsigned long opt) 
	if (lmp_bredr_capable(hdev))

		bredr_setup(req);

	else

		clear_bit(HCI_BREDR_ENABLED, &hdev->dev_flags);

		hci_dev_clear_flag(hdev, HCI_BREDR_ENABLED);



	if (lmp_le_capable(hdev))

		le_setup(req);
@@ -1625,8 +1625,8 @@ static int hci_dev_do_close(struct hci_dev *hdev) 
	if (hdev->discov_timeout > 0) {

		cancel_delayed_work(&hdev->discov_off);

		hdev->discov_timeout = 0;

		clear_bit(HCI_DISCOVERABLE, &hdev->dev_flags);

		clear_bit(HCI_LIMITED_DISCOVERABLE, &hdev->dev_flags);

		hci_dev_clear_flag(hdev, HCI_DISCOVERABLE);

		hci_dev_clear_flag(hdev, HCI_LIMITED_DISCOVERABLE);

	}



	if (test_and_clear_bit(HCI_SERVICE_CACHE, &hdev->dev_flags))
@@ -1846,7 +1846,7 @@ static void hci_update_scan_state(struct hci_dev *hdev, u8 scan) 
		discov_changed = !test_and_set_bit(HCI_DISCOVERABLE,

						   &hdev->dev_flags);

	} else {

		clear_bit(HCI_LIMITED_DISCOVERABLE, &hdev->dev_flags);

		hci_dev_clear_flag(hdev, HCI_LIMITED_DISCOVERABLE);

		discov_changed = test_and_clear_bit(HCI_DISCOVERABLE,

						    &hdev->dev_flags);

	}
@@ -2087,7 +2087,7 @@ static int hci_rfkill_set_block(void *data, bool blocked) 
		    !hci_dev_test_flag(hdev, HCI_CONFIG))

			hci_dev_do_close(hdev);

	} else {

		clear_bit(HCI_RFKILLED, &hdev->dev_flags);

		hci_dev_clear_flag(hdev, HCI_RFKILLED);

	}



	return 0;
@@ -2121,7 +2121,7 @@ static void hci_power_on(struct work_struct *work) 
	    (hdev->dev_type == HCI_BREDR &&

	     !bacmp(&hdev->bdaddr, BDADDR_ANY) &&

	     !bacmp(&hdev->static_addr, BDADDR_ANY))) {

		clear_bit(HCI_AUTO_OFF, &hdev->dev_flags);

		hci_dev_clear_flag(hdev, HCI_AUTO_OFF);

		hci_dev_do_close(hdev);

	} else if (hci_dev_test_flag(hdev, HCI_AUTO_OFF)) {

		queue_delayed_work(hdev->req_workqueue, &hdev->power_off,

net/bluetooth/hci_event.c

+8 −8
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static void hci_cc_exit_periodic_inq(struct hci_dev *hdev, struct sk_buff *skb) 
	if (status)

		return;



	clear_bit(HCI_PERIODIC_INQ, &hdev->dev_flags);

	hci_dev_clear_flag(hdev, HCI_PERIODIC_INQ);



	hci_conn_check_pending(hdev);

}
@@ -503,7 +503,7 @@ static void hci_cc_write_ssp_mode(struct hci_dev *hdev, struct sk_buff *skb) 
		if (sent->mode)

			hci_dev_set_flag(hdev, HCI_SSP_ENABLED);

		else

			clear_bit(HCI_SSP_ENABLED, &hdev->dev_flags);

			hci_dev_clear_flag(hdev, HCI_SSP_ENABLED);

	}



	hci_dev_unlock(hdev);
@@ -533,7 +533,7 @@ static void hci_cc_write_sc_support(struct hci_dev *hdev, struct sk_buff *skb) 
		if (sent->support)

			hci_dev_set_flag(hdev, HCI_SC_ENABLED);

		else

			clear_bit(HCI_SC_ENABLED, &hdev->dev_flags);

			hci_dev_clear_flag(hdev, HCI_SC_ENABLED);

	}



	hci_dev_unlock(hdev);
@@ -1117,7 +1117,7 @@ static void hci_cc_le_set_adv_enable(struct hci_dev *hdev, struct sk_buff *skb) 
					   &conn->le_conn_timeout,

					   conn->conn_timeout);

	} else {

		clear_bit(HCI_LE_ADV, &hdev->dev_flags);

		hci_dev_clear_flag(hdev, HCI_LE_ADV);

	}



	hci_dev_unlock(hdev);
@@ -1217,7 +1217,7 @@ static void hci_cc_le_set_scan_enable(struct hci_dev *hdev, 
		 */

		cancel_delayed_work(&hdev->le_scan_disable);



		clear_bit(HCI_LE_SCAN, &hdev->dev_flags);

		hci_dev_clear_flag(hdev, HCI_LE_SCAN);



		/* The HCI_LE_SCAN_INTERRUPTED flag indicates that we

		 * interrupted scanning due to a connect request. Mark
@@ -1391,8 +1391,8 @@ static void hci_cc_write_le_host_supported(struct hci_dev *hdev, 
		hci_dev_set_flag(hdev, HCI_LE_ENABLED);

	} else {

		hdev->features[1][0] &= ~LMP_HOST_LE;

		clear_bit(HCI_LE_ENABLED, &hdev->dev_flags);

		clear_bit(HCI_ADVERTISING, &hdev->dev_flags);

		hci_dev_clear_flag(hdev, HCI_LE_ENABLED);

		hci_dev_clear_flag(hdev, HCI_ADVERTISING);

	}



	if (sent->simul)
@@ -4409,7 +4409,7 @@ static void hci_le_conn_complete_evt(struct hci_dev *hdev, struct sk_buff *skb) 
	/* All controllers implicitly stop advertising in the event of a

	 * connection, so ensure that the state bit is cleared.

	 */

	clear_bit(HCI_LE_ADV, &hdev->dev_flags);

	hci_dev_clear_flag(hdev, HCI_LE_ADV);



	conn = hci_conn_hash_lookup_state(hdev, LE_LINK, BT_CONNECT);

	if (!conn) {

net/bluetooth/hci_sock.c

+2 −2
Original line number Diff line number Diff line
@@ -474,7 +474,7 @@ static int hci_sock_release(struct socket *sock) 
	if (hdev) {

		if (hci_pi(sk)->channel == HCI_CHANNEL_USER) {

			mgmt_index_added(hdev);

			clear_bit(HCI_USER_CHANNEL, &hdev->dev_flags);

			hci_dev_clear_flag(hdev, HCI_USER_CHANNEL);

			hci_dev_close(hdev->id);

		}
@@ -730,7 +730,7 @@ static int hci_sock_bind(struct socket *sock, struct sockaddr *addr, 


		err = hci_dev_open(hdev->id);

		if (err) {

			clear_bit(HCI_USER_CHANNEL, &hdev->dev_flags);

			hci_dev_clear_flag(hdev, HCI_USER_CHANNEL);

			mgmt_index_added(hdev);

			hci_dev_put(hdev);

			goto done;