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

Commit dcf4adbf authored by Joe Perches's avatar Joe Perches Committed by Marcel Holtmann
Browse files

Bluetooth: Convert uses of __constant_<foo> to <foo> 



The use of __constant_<foo> has been unnecessary for quite awhile now.

Make these uses consistent with the rest of the kernel.

Signed-off-by: default avatarJoe Perches <joe@perches.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent 4340a124

net/bluetooth/a2mp.c

+2 −2
Original line number Diff line number Diff line
@@ -162,7 +162,7 @@ static int a2mp_discover_req(struct amp_mgr *mgr, struct sk_buff *skb, 
		return -ENOMEM;

	}



	rsp->mtu = __constant_cpu_to_le16(L2CAP_A2MP_DEFAULT_MTU);

	rsp->mtu = cpu_to_le16(L2CAP_A2MP_DEFAULT_MTU);

	rsp->ext_feat = 0;



	__a2mp_add_cl(mgr, rsp->cl);
@@ -649,7 +649,7 @@ static int a2mp_chan_recv_cb(struct l2cap_chan *chan, struct sk_buff *skb) 
	if (err) {

		struct a2mp_cmd_rej rej;



		rej.reason = __constant_cpu_to_le16(0);

		rej.reason = cpu_to_le16(0);

		hdr = (void *) skb->data;



		BT_DBG("Send A2MP Rej: cmd 0x%2.2x err %d", hdr->code, err);

net/bluetooth/hci_conn.c

+13 −13
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ static void hci_acl_create_connection(struct hci_conn *conn) 
			cp.pscan_rep_mode = ie->data.pscan_rep_mode;

			cp.pscan_mode     = ie->data.pscan_mode;

			cp.clock_offset   = ie->data.clock_offset |

					    __constant_cpu_to_le16(0x8000);

					    cpu_to_le16(0x8000);

		}



		memcpy(conn->dev_class, ie->data.dev_class, 3);
@@ -182,8 +182,8 @@ bool hci_setup_sync(struct hci_conn *conn, __u16 handle) 


	cp.handle   = cpu_to_le16(handle);



	cp.tx_bandwidth   = __constant_cpu_to_le32(0x00001f40);

	cp.rx_bandwidth   = __constant_cpu_to_le32(0x00001f40);

	cp.tx_bandwidth   = cpu_to_le32(0x00001f40);

	cp.rx_bandwidth   = cpu_to_le32(0x00001f40);

	cp.voice_setting  = cpu_to_le16(conn->setting);



	switch (conn->setting & SCO_AIRMODE_MASK) {
@@ -225,8 +225,8 @@ void hci_le_conn_update(struct hci_conn *conn, u16 min, u16 max, 
	cp.conn_interval_max	= cpu_to_le16(max);

	cp.conn_latency		= cpu_to_le16(latency);

	cp.supervision_timeout	= cpu_to_le16(to_multiplier);

	cp.min_ce_len		= __constant_cpu_to_le16(0x0000);

	cp.max_ce_len		= __constant_cpu_to_le16(0x0000);

	cp.min_ce_len		= cpu_to_le16(0x0000);

	cp.max_ce_len		= cpu_to_le16(0x0000);



	hci_send_cmd(hdev, HCI_OP_LE_CONN_UPDATE, sizeof(cp), &cp);

}
@@ -337,9 +337,9 @@ static void hci_conn_idle(struct work_struct *work) 
	if (lmp_sniffsubr_capable(hdev) && lmp_sniffsubr_capable(conn)) {

		struct hci_cp_sniff_subrate cp;

		cp.handle             = cpu_to_le16(conn->handle);

		cp.max_latency        = __constant_cpu_to_le16(0);

		cp.min_remote_timeout = __constant_cpu_to_le16(0);

		cp.min_local_timeout  = __constant_cpu_to_le16(0);

		cp.max_latency        = cpu_to_le16(0);

		cp.min_remote_timeout = cpu_to_le16(0);

		cp.min_local_timeout  = cpu_to_le16(0);

		hci_send_cmd(hdev, HCI_OP_SNIFF_SUBRATE, sizeof(cp), &cp);

	}
@@ -348,8 +348,8 @@ static void hci_conn_idle(struct work_struct *work) 
		cp.handle       = cpu_to_le16(conn->handle);

		cp.max_interval = cpu_to_le16(hdev->sniff_max_interval);

		cp.min_interval = cpu_to_le16(hdev->sniff_min_interval);

		cp.attempt      = __constant_cpu_to_le16(4);

		cp.timeout      = __constant_cpu_to_le16(1);

		cp.attempt      = cpu_to_le16(4);

		cp.timeout      = cpu_to_le16(1);

		hci_send_cmd(hdev, HCI_OP_SNIFF_MODE, sizeof(cp), &cp);

	}

}
@@ -596,9 +596,9 @@ static void hci_req_add_le_create_conn(struct hci_request *req, 
	cp.own_address_type = own_addr_type;

	cp.conn_interval_min = cpu_to_le16(conn->le_conn_min_interval);

	cp.conn_interval_max = cpu_to_le16(conn->le_conn_max_interval);

	cp.supervision_timeout = __constant_cpu_to_le16(0x002a);

	cp.min_ce_len = __constant_cpu_to_le16(0x0000);

	cp.max_ce_len = __constant_cpu_to_le16(0x0000);

	cp.supervision_timeout = cpu_to_le16(0x002a);

	cp.min_ce_len = cpu_to_le16(0x0000);

	cp.max_ce_len = cpu_to_le16(0x0000);



	hci_req_add(req, HCI_OP_LE_CREATE_CONN, sizeof(cp), &cp);

net/bluetooth/hci_core.c

+1 −1
Original line number Diff line number Diff line
@@ -1349,7 +1349,7 @@ static void bredr_setup(struct hci_request *req) 
	hci_req_add(req, HCI_OP_SET_EVENT_FLT, 1, &flt_type);



	/* Connection accept timeout ~20 secs */

	param = __constant_cpu_to_le16(0x7d00);

	param = cpu_to_le16(0x7d00);

	hci_req_add(req, HCI_OP_WRITE_CA_TIMEOUT, 2, &param);



	/* AVM Berlin (31), aka "BlueFRITZ!", reports version 1.2,

net/bluetooth/hci_event.c

+3 −3
Original line number Diff line number Diff line
@@ -1924,9 +1924,9 @@ static void hci_conn_request_evt(struct hci_dev *hdev, struct sk_buff *skb) 
			bacpy(&cp.bdaddr, &ev->bdaddr);

			cp.pkt_type = cpu_to_le16(conn->pkt_type);



			cp.tx_bandwidth   = __constant_cpu_to_le32(0x00001f40);

			cp.rx_bandwidth   = __constant_cpu_to_le32(0x00001f40);

			cp.max_latency    = __constant_cpu_to_le16(0xffff);

			cp.tx_bandwidth   = cpu_to_le32(0x00001f40);

			cp.rx_bandwidth   = cpu_to_le32(0x00001f40);

			cp.max_latency    = cpu_to_le16(0xffff);

			cp.content_format = cpu_to_le16(hdev->voice_setting);

			cp.retrans_effort = 0xff;

net/bluetooth/hci_sock.c

+8 −8
Original line number Diff line number Diff line
@@ -211,22 +211,22 @@ void hci_send_to_monitor(struct hci_dev *hdev, struct sk_buff *skb) 


	switch (bt_cb(skb)->pkt_type) {

	case HCI_COMMAND_PKT:

		opcode = __constant_cpu_to_le16(HCI_MON_COMMAND_PKT);

		opcode = cpu_to_le16(HCI_MON_COMMAND_PKT);

		break;

	case HCI_EVENT_PKT:

		opcode = __constant_cpu_to_le16(HCI_MON_EVENT_PKT);

		opcode = cpu_to_le16(HCI_MON_EVENT_PKT);

		break;

	case HCI_ACLDATA_PKT:

		if (bt_cb(skb)->incoming)

			opcode = __constant_cpu_to_le16(HCI_MON_ACL_RX_PKT);

			opcode = cpu_to_le16(HCI_MON_ACL_RX_PKT);

		else

			opcode = __constant_cpu_to_le16(HCI_MON_ACL_TX_PKT);

			opcode = cpu_to_le16(HCI_MON_ACL_TX_PKT);

		break;

	case HCI_SCODATA_PKT:

		if (bt_cb(skb)->incoming)

			opcode = __constant_cpu_to_le16(HCI_MON_SCO_RX_PKT);

			opcode = cpu_to_le16(HCI_MON_SCO_RX_PKT);

		else

			opcode = __constant_cpu_to_le16(HCI_MON_SCO_TX_PKT);

			opcode = cpu_to_le16(HCI_MON_SCO_TX_PKT);

		break;

	default:

		return;
@@ -319,7 +319,7 @@ static struct sk_buff *create_monitor_event(struct hci_dev *hdev, int event) 
		bacpy(&ni->bdaddr, &hdev->bdaddr);

		memcpy(ni->name, hdev->name, 8);



		opcode = __constant_cpu_to_le16(HCI_MON_NEW_INDEX);

		opcode = cpu_to_le16(HCI_MON_NEW_INDEX);

		break;



	case HCI_DEV_UNREG:
@@ -327,7 +327,7 @@ static struct sk_buff *create_monitor_event(struct hci_dev *hdev, int event) 
		if (!skb)

			return NULL;



		opcode = __constant_cpu_to_le16(HCI_MON_DEL_INDEX);

		opcode = cpu_to_le16(HCI_MON_DEL_INDEX);

		break;



	default: