Revert "sound: usb: Provide controller number in QMI response"

This reverts commit 9730f9cdc0874d372a3eb10680ed8622e26db2bb.

Remote entity does not require the controller number. Tunnel
mode audio will only work with the primary controller. Hence
remove support for providing controller num.

Change-Id: Ife8c0ca969334c57046a91bae428b5f89f9e0566
Signed-off-by: Ajay Agarwal <ajaya@codeaurora.org>

diff --git a/sound/usb/usb_audio_qmi_svc.c b/sound/usb/usb_audio_qmi_svc.c
index 519da13..dc66b60 100644 (file)
--- a/sound/usb/usb_audio_qmi_svc.c
+++ b/sound/usb/usb_audio_qmi_svc.c
@@ -555,13 +555,6 @@ skip_sync_ep:
        resp->interrupter_num = uaudio_qdev->intr_num;
        resp->interrupter_num_valid = 1;
 
-       ret = usb_get_controller_id(subs->dev);
-       if (ret < 0)
-               goto err;
-
-       resp->controller_num =  ret;
-       resp->controller_num_valid = 1;
-
        /*  map xhci data structures PA memory to iova */
 
        /* event ring */

diff --git a/sound/usb/usb_audio_qmi_v01.c b/sound/usb/usb_audio_qmi_v01.c
index 9b97fd2..beff1aa 100644 (file)
--- a/sound/usb/usb_audio_qmi_v01.c
+++ b/sound/usb/usb_audio_qmi_v01.c
@@ -633,46 +633,6 @@ struct elem_info qmi_uaudio_stream_resp_msg_v01_ei[] = {
                                        interrupter_num),
        },
        {
-               .data_type      = QMI_OPT_FLAG,
-               .elem_len       = 1,
-               .elem_size      = sizeof(uint8_t),
-               .is_array       = NO_ARRAY,
-               .tlv_type       = 0x1C,
-               .offset         = offsetof(
-                                       struct qmi_uaudio_stream_resp_msg_v01,
-                                       speed_info_valid),
-       },
-       {
-               .data_type      = QMI_SIGNED_4_BYTE_ENUM,
-               .elem_len       = 1,
-               .elem_size      = sizeof(enum usb_audio_device_speed_enum_v01),
-               .is_array       = NO_ARRAY,
-               .tlv_type       = 0x1C,
-               .offset         = offsetof(
-                                       struct qmi_uaudio_stream_resp_msg_v01,
-                                       speed_info),
-       },
-       {
-               .data_type      = QMI_OPT_FLAG,
-               .elem_len       = 1,
-               .elem_size      = sizeof(uint8_t),
-               .is_array       = NO_ARRAY,
-               .tlv_type       = 0x1D,
-               .offset         = offsetof(
-                                       struct qmi_uaudio_stream_resp_msg_v01,
-                                       controller_num_valid),
-       },
-       {
-               .data_type      = QMI_UNSIGNED_1_BYTE,
-               .elem_len       = 1,
-               .elem_size      = sizeof(uint8_t),
-               .is_array       = NO_ARRAY,
-               .tlv_type       = 0x1D,
-               .offset         = offsetof(
-                                       struct qmi_uaudio_stream_resp_msg_v01,
-                                       controller_num),
-       },
-       {
                .data_type      = QMI_EOTI,
                .is_array       = NO_ARRAY,
                .is_array       = QMI_COMMON_TLV_TYPE,

diff --git a/sound/usb/usb_audio_qmi_v01.h b/sound/usb/usb_audio_qmi_v01.h
index 32315fd..f3b6eb0 100644 (file)
--- a/sound/usb/usb_audio_qmi_v01.h
+++ b/sound/usb/usb_audio_qmi_v01.h
@@ -77,16 +77,6 @@ enum usb_audio_device_indication_enum_v01 {
        USB_AUDIO_DEVICE_INDICATION_ENUM_MAX_VAL_V01 = INT_MAX,
 };
 
-enum usb_audio_device_speed_enum_v01 {
-       USB_AUDIO_DEVICE_SPEED_ENUM_MIN_VAL_V01 = INT_MIN,
-       USB_AUDIO_DEVICE_SPEED_INVALID_V01 = 0,
-       USB_AUDIO_DEVICE_SPEED_LOW_V01 = 1,
-       USB_AUDIO_DEVICE_SPEED_FULL_V01 = 2,
-       USB_AUDIO_DEVICE_SPEED_HIGH_V01 = 3,
-       USB_AUDIO_DEVICE_SPEED_SUPER_V01 = 4,
-       USB_AUDIO_DEVICE_SPEED_ENUM_MAX_VAL_V01 = INT_MAX,
-};
-
 struct qmi_uaudio_stream_req_msg_v01 {
        uint8_t enable;
        uint32_t usb_token;
@@ -128,12 +118,8 @@ struct qmi_uaudio_stream_resp_msg_v01 {
        struct apps_mem_info_v01 xhci_mem_info;
        uint8_t interrupter_num_valid;
        uint8_t interrupter_num;
-       uint8_t speed_info_valid;
-       enum usb_audio_device_speed_enum_v01 speed_info;
-       uint8_t controller_num_valid;
-       uint8_t controller_num;
 };
-#define QMI_UAUDIO_STREAM_RESP_MSG_V01_MAX_MSG_LEN 202
+#define QMI_UAUDIO_STREAM_RESP_MSG_V01_MAX_MSG_LEN 191
 extern struct elem_info qmi_uaudio_stream_resp_msg_v01_ei[];
 
 struct qmi_uaudio_stream_ind_msg_v01 {