Bluetooth: Rename cmd_complete() to mgmt_cmd_complete()

This patch renames the cmd_complete() function to mgmt_cmd_complete() in
preparation of making it a generic helper for other modules to use too.

Signed-off-by: Johan Hedberg <johan.hedberg@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>

1 files changed, 229 insertions, 213 deletions

diff --git a/net/bluetooth/mgmt.c b/net/bluetooth/mgmt.c
index 6f20b78e1965..835a459531ab 100644
--- a/net/bluetooth/mgmt.c
+++ b/net/bluetooth/mgmt.c
@@ -279,8 +279,8 @@ static int mgmt_cmd_status(struct sock *sk, u16 index, u16 cmd, u8 status)
         return err;
 }
 
-static int cmd_complete(struct sock *sk, u16 index, u16 cmd, u8 status,
-                        void *rp, size_t rp_len)
+static int mgmt_cmd_complete(struct sock *sk, u16 index, u16 cmd, u8 status,
+                             void *rp, size_t rp_len)
 {
         struct sk_buff *skb;
         struct mgmt_hdr *hdr;
@@ -323,8 +323,8 @@ static int read_version(struct sock *sk, struct hci_dev *hdev, void *data,
         rp.version = MGMT_VERSION;
         rp.revision = cpu_to_le16(MGMT_REVISION);
 
-        return cmd_complete(sk, MGMT_INDEX_NONE, MGMT_OP_READ_VERSION, 0, &rp,
-                            sizeof(rp));
+        return mgmt_cmd_complete(sk, MGMT_INDEX_NONE, MGMT_OP_READ_VERSION, 0,
+                                 &rp, sizeof(rp));
 }
 
 static int read_commands(struct sock *sk, struct hci_dev *hdev, void *data,
@@ -354,8 +354,8 @@ static int read_commands(struct sock *sk, struct hci_dev *hdev, void *data,
         for (i = 0; i < num_events; i++, opcode++)
                 put_unaligned_le16(mgmt_events[i], opcode);
 
-        err = cmd_complete(sk, MGMT_INDEX_NONE, MGMT_OP_READ_COMMANDS, 0, rp,
-                           rp_size);
+        err = mgmt_cmd_complete(sk, MGMT_INDEX_NONE, MGMT_OP_READ_COMMANDS, 0,
+                                rp, rp_size);
         kfree(rp);
 
         return err;
@@ -413,8 +413,8 @@ static int read_index_list(struct sock *sk, struct hci_dev *hdev, void *data,
 
         read_unlock(&hci_dev_list_lock);
 
-        err = cmd_complete(sk, MGMT_INDEX_NONE, MGMT_OP_READ_INDEX_LIST, 0, rp,
-                           rp_len);
+        err = mgmt_cmd_complete(sk, MGMT_INDEX_NONE, MGMT_OP_READ_INDEX_LIST,
+                                0, rp, rp_len);
 
         kfree(rp);
 
@@ -473,8 +473,8 @@ static int read_unconf_index_list(struct sock *sk, struct hci_dev *hdev,
 
         read_unlock(&hci_dev_list_lock);
 
-        err = cmd_complete(sk, MGMT_INDEX_NONE, MGMT_OP_READ_UNCONF_INDEX_LIST,
-                           0, rp, rp_len);
+        err = mgmt_cmd_complete(sk, MGMT_INDEX_NONE,
+                                MGMT_OP_READ_UNCONF_INDEX_LIST, 0, rp, rp_len);
 
         kfree(rp);
 
@@ -521,8 +521,8 @@ static int send_options_rsp(struct sock *sk, u16 opcode, struct hci_dev *hdev)
 {
         __le32 options = get_missing_options(hdev);
 
-        return cmd_complete(sk, hdev->id, opcode, 0, &options,
-                            sizeof(options));
+        return mgmt_cmd_complete(sk, hdev->id, opcode, 0, &options,
+                                 sizeof(options));
 }
 
 static int read_config_info(struct sock *sk, struct hci_dev *hdev,
@@ -549,8 +549,8 @@ static int read_config_info(struct sock *sk, struct hci_dev *hdev,
 
         hci_dev_unlock(hdev);
 
-        return cmd_complete(sk, hdev->id, MGMT_OP_READ_CONFIG_INFO, 0, &rp,
-                            sizeof(rp));
+        return mgmt_cmd_complete(sk, hdev->id, MGMT_OP_READ_CONFIG_INFO, 0,
+                                 &rp, sizeof(rp));
 }
 
 static u32 get_supported_settings(struct hci_dev *hdev)
@@ -1206,8 +1206,8 @@ static int read_controller_info(struct sock *sk, struct hci_dev *hdev,
 
         hci_dev_unlock(hdev);
 
-        return cmd_complete(sk, hdev->id, MGMT_OP_READ_INFO, 0, &rp,
-                            sizeof(rp));
+        return mgmt_cmd_complete(sk, hdev->id, MGMT_OP_READ_INFO, 0, &rp,
+                                 sizeof(rp));
 }
 
 static void mgmt_pending_free(struct pending_cmd *cmd)
@@ -1271,8 +1271,8 @@ static int send_settings_rsp(struct sock *sk, u16 opcode, struct hci_dev *hdev)
 {
         __le32 settings = cpu_to_le32(get_current_settings(hdev));
 
-        return cmd_complete(sk, hdev->id, opcode, 0, &settings,
-                            sizeof(settings));
+        return mgmt_cmd_complete(sk, hdev->id, opcode, 0, &settings,
+                                 sizeof(settings));
 }
 
 static void clean_up_hci_complete(struct hci_dev *hdev, u8 status, u16 opcode)
@@ -1512,14 +1512,14 @@ static void cmd_complete_rsp(struct pending_cmd *cmd, void *data)
 
 static int generic_cmd_complete(struct pending_cmd *cmd, u8 status)
 {
-        return cmd_complete(cmd->sk, cmd->index, cmd->opcode, status,
-                            cmd->param, cmd->param_len);
+        return mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode, status,
+                                 cmd->param, cmd->param_len);
 }
 
 static int addr_cmd_complete(struct pending_cmd *cmd, u8 status)
 {
-        return cmd_complete(cmd->sk, cmd->index, cmd->opcode, status, cmd->param,
-                            sizeof(struct mgmt_addr_info));
+        return mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode, status,
+                                 cmd->param, sizeof(struct mgmt_addr_info));
 }
 
 static u8 mgmt_bredr_support(struct hci_dev *hdev)
@@ -2407,8 +2407,8 @@ static void mgmt_class_complete(struct hci_dev *hdev, u16 mgmt_op, u8 status)
         if (!cmd)
                 goto unlock;
 
-        cmd_complete(cmd->sk, cmd->index, cmd->opcode, mgmt_status(status),
-                     hdev->dev_class, 3);
+        mgmt_cmd_complete(cmd->sk, cmd->index, cmd->opcode,
+                          mgmt_status(status), hdev->dev_class, 3);
 
         mgmt_pending_remove(cmd);
 
@@ -2463,8 +2463,8 @@ static int add_uuid(struct sock *sk, struct hci_dev *hdev, void *data, u16 len)
                 if (err != -ENODATA)
                         goto failed;
 
-                err = cmd_complete(sk, hdev->id, MGMT_OP_ADD_UUID, 0,
-                                   hdev->dev_class, 3);
+                err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_ADD_UUID, 0,
+                                        hdev->dev_class, 3);
                 goto failed;
         }
 
@@ -2526,8 +2526,9 @@ static int remove_uuid(struct sock *sk, struct hci_dev *hdev, void *data,
                 hci_uuids_clear(hdev);
 
                 if (enable_service_cache(hdev)) {
-                        err = cmd_complete(sk, hdev->id, MGMT_OP_REMOVE_UUID,
-                                           0, hdev->dev_class, 3);
+                        err = mgmt_cmd_complete(sk, hdev->id,
+                                                MGMT_OP_REMOVE_UUID,
+                                                0, hdev->dev_class, 3);
                         goto unlock;
                 }
 
@@ -2562,8 +2563,8 @@ update_class:
                 if (err != -ENODATA)
                         goto unlock;
 
-                err = cmd_complete(sk, hdev->id, MGMT_OP_REMOVE_UUID, 0,
-                                   hdev->dev_class, 3);
+                err = mgmt_cmd_complete(sk, hdev->id, MGMT_OP_REMOVE_UUID, 0,
+                                        hdev->dev_class, 3);
                 goto unlock;
         }
 
@@ -2619,8 +2620,8 @@ static int set_dev_class(struct sock *sk, struct hci_dev *hdev, void *data,
         hdev->minor_class = cp->minor;
 
         if (!hdev_is_powered(hdev)) {