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

Commit ffa88e02 authored by Gustavo Padovan's avatar Gustavo Padovan
Browse files

Bluetooth: Move double negation to macros 



Some comparisons needs to double negation(!!) in order to make the value
of the field boolean. Add it to the macro makes the code more readable.

Signed-off-by: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
parent 20714bfe

include/net/bluetooth/hci_core.h

+3 −3
Original line number Diff line number Diff line
@@ -767,7 +767,7 @@ void hci_conn_del_sysfs(struct hci_conn *conn); 
#define lmp_sniffsubr_capable(dev) ((dev)->features[5] & LMP_SNIFF_SUBR)

#define lmp_pause_enc_capable(dev) ((dev)->features[5] & LMP_PAUSE_ENC)

#define lmp_ext_inq_capable(dev)   ((dev)->features[6] & LMP_EXT_INQ)

#define lmp_le_br_capable(dev)     ((dev)->features[6] & LMP_SIMUL_LE_BR)

#define lmp_le_br_capable(dev)     !!((dev)->features[6] & LMP_SIMUL_LE_BR)

#define lmp_ssp_capable(dev)       ((dev)->features[6] & LMP_SIMPLE_PAIR)

#define lmp_no_flush_capable(dev)  ((dev)->features[6] & LMP_NO_FLUSH)

#define lmp_lsto_capable(dev)      ((dev)->features[7] & LMP_LSTO)
@@ -776,8 +776,8 @@ void hci_conn_del_sysfs(struct hci_conn *conn); 


/* ----- Extended LMP capabilities ----- */

#define lmp_host_ssp_capable(dev)  ((dev)->host_features[0] & LMP_HOST_SSP)

#define lmp_host_le_capable(dev)   ((dev)->host_features[0] & LMP_HOST_LE)

#define lmp_host_le_br_capable(dev) ((dev)->host_features[0] & LMP_HOST_LE_BREDR)

#define lmp_host_le_capable(dev)   !!((dev)->host_features[0] & LMP_HOST_LE)

#define lmp_host_le_br_capable(dev) !!((dev)->host_features[0] & LMP_HOST_LE_BREDR)



/* ----- HCI protocols ----- */

#define HCI_PROTO_DEFER             0x01

net/bluetooth/hci_event.c

+2 −2
Original line number Diff line number Diff line
@@ -794,10 +794,10 @@ static void hci_set_le_support(struct hci_dev *hdev) 


	if (test_bit(HCI_LE_ENABLED, &hdev->dev_flags)) {

		cp.le = 1;

		cp.simul = !!lmp_le_br_capable(hdev);

		cp.simul = lmp_le_br_capable(hdev);

	}



	if (cp.le != !!lmp_host_le_capable(hdev))

	if (cp.le != lmp_host_le_capable(hdev))

		hci_send_cmd(hdev, HCI_OP_WRITE_LE_HOST_SUPPORTED, sizeof(cp),

			     &cp);

}

net/bluetooth/mgmt.c

+5 −5
Original line number Diff line number Diff line
@@ -1225,7 +1225,7 @@ static int set_le(struct sock *sk, struct hci_dev *hdev, void *data, u16 len) 
	}



	val = !!cp->val;

	enabled = !!lmp_host_le_capable(hdev);

	enabled = lmp_host_le_capable(hdev);



	if (!hdev_is_powered(hdev) || val == enabled) {

		bool changed = false;
@@ -1261,7 +1261,7 @@ static int set_le(struct sock *sk, struct hci_dev *hdev, void *data, u16 len) 


	if (val) {

		hci_cp.le = val;

		hci_cp.simul = !!lmp_le_br_capable(hdev);

		hci_cp.simul = lmp_le_br_capable(hdev);

	}



	err = hci_send_cmd(hdev, HCI_OP_WRITE_LE_HOST_SUPPORTED, sizeof(hci_cp),
@@ -2924,13 +2924,13 @@ int mgmt_powered(struct hci_dev *hdev, u8 powered) 
			struct hci_cp_write_le_host_supported cp;



			cp.le = 1;

			cp.simul = !!lmp_le_br_capable(hdev);

			cp.simul = lmp_le_br_capable(hdev);



			/* Check first if we already have the right

			 * host state (host features set)

			 */

			if (cp.le != !!lmp_host_le_capable(hdev) ||

			    cp.simul != !!lmp_host_le_br_capable(hdev))

			if (cp.le != lmp_host_le_capable(hdev) ||

			    cp.simul != lmp_host_le_br_capable(hdev))

				hci_send_cmd(hdev,

					     HCI_OP_WRITE_LE_HOST_SUPPORTED,

					     sizeof(cp), &cp);