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: Archie Pusaka <apusaka@chromium.org>
Reviewed-by: Miao-chen Chou <mcchou@chromium.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

diff --git a/net/bluetooth/hci_event.c b/net/bluetooth/hci_event.c
index e289187075b9a214a0625acf0a6194cf92010f9b..43c324c46c0ba28e327bf9d6ca0b9b1b4792346c 100644 (file)
--- a/net/bluetooth/hci_event.c
+++ b/net/bluetooth/hci_event.c
@@ -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;

diff --git a/net/bluetooth/hidp/core.c b/net/bluetooth/hidp/core.c
index 0db48c81266230b97ab95bd7cfd3c9860eed02e4..96fedef14723e4bcc86c4dd11045506e9d1407f5 100644 (file)
--- a/net/bluetooth/hidp/core.c
+++ b/net/bluetooth/hidp/core.c
@@ -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;

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index fac972415d68494b8bf62d800905e131881b3f26..80ec35c67ea5ad293952a8b840a2655d6929e2d8 100644 (file)
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -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