Commit 67ffb185 authored by Archie Pusaka's avatar Archie Pusaka Committed by Marcel Holtmann
Browse files

Bluetooth: use inclusive language in comments 

This patch replaces some non-inclusive terms based on the appropriate
language mapping table compiled by the Bluetooth SIG:
https://specificationrefs.bluetooth.com/language-mapping/Appropriate_Language_Mapping_Table.pdf



Specifically, these terms are replaced:
slave       -> peripheral
blacklisted -> blocked

Signed-off-by: default avatarArchie Pusaka <apusaka@chromium.org>
Reviewed-by: default avatarMiao-chen Chou <mcchou@chromium.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent fad646e1

net/bluetooth/hci_event.c

+3 −3
Original line number Diff line number Diff line
@@ -5404,7 +5404,7 @@ static struct hci_conn *check_pending_le_conn(struct hci_dev *hdev, 
		case HCI_AUTO_CONN_DIRECT:

			/* Only devices advertising with ADV_DIRECT_IND are

			 * triggering a connection attempt. This is allowing

			 * incoming connections from slave devices.

			 * incoming connections from peripheral devices.

			 */

			if (adv_type != LE_ADV_DIRECT_IND)

				return NULL;
@@ -5412,8 +5412,8 @@ static struct hci_conn *check_pending_le_conn(struct hci_dev *hdev, 
		case HCI_AUTO_CONN_ALWAYS:

			/* Devices advertising with ADV_IND or ADV_DIRECT_IND

			 * are triggering a connection attempt. This means

			 * that incoming connections from slave device are

			 * accepted and also outgoing connections to slave

			 * that incoming connections from peripheral device are

			 * accepted and also outgoing connections to peripheral

			 * devices are established when found.

			 */

			break;

net/bluetooth/hidp/core.c

+1 −1
Original line number Diff line number Diff line
@@ -794,7 +794,7 @@ static int hidp_setup_hid(struct hidp_session *session, 
	hid->dev.parent = &session->conn->hcon->dev;

	hid->ll_driver = &hidp_hid_driver;



	/* True if device is blacklisted in drivers/hid/hid-quirks.c */

	/* True if device is blocked in drivers/hid/hid-quirks.c */

	if (hid_ignore(hid)) {

		hid_destroy_device(session->hid);

		session->hid = NULL;

net/bluetooth/mgmt.c

+1 −1
Original line number Diff line number Diff line
@@ -2959,7 +2959,7 @@ static int pair_device(struct sock *sk, struct hci_dev *hdev, void *data, 
		/* When pairing a new device, it is expected to remember

		 * this device for future connections. Adding the connection

		 * parameter information ahead of time allows tracking

		 * of the slave preferred values and will speed up any

		 * of the peripheral preferred values and will speed up any

		 * further connection establishment.

		 *

		 * If connection parameters already exist, then they