summaryrefslogtreecommitdiffstats
path: root/drivers/staging/greybus/greybus_protocols.h
diff options
context:
space:
mode:
authorMark Greer <mgreer@animalcreek.com>2016-08-02 20:30:28 -0700
committerGreg Kroah-Hartman <gregkh@google.com>2016-08-03 10:59:13 +0200
commit8f60ce76a4eb0911ddd5833badd0d27bb5dfb894 (patch)
treeea80d5d0b07dd5426fae6e59d444a64c71113dfb /drivers/staging/greybus/greybus_protocols.h
parentccc57e20d1cc54b6536a4e63f6da91f42b65000f (diff)
downloadlinux-8f60ce76a4eb0911ddd5833badd0d27bb5dfb894.tar.bz2
greybus: audio: Remove GET_TX/RX_DELAY message types
The 'GB_AUDIO_TYPE_GET_TX_DELAY' and 'GB_AUDIO_TYPE_GET_RX_DELAY' are no longer a part of the Greybus Audio Device Class Protocol so remove support for them. The message numbers are not coalesced to prevent compatibility issues between the AP and the module. Testing Done: Played music using a speaker module Signed-off-by: Mark Greer <mgreer@animalcreek.com> Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Diffstat (limited to 'drivers/staging/greybus/greybus_protocols.h')
-rw-r--r--drivers/staging/greybus/greybus_protocols.h20
1 files changed, 2 insertions, 18 deletions
diff --git a/drivers/staging/greybus/greybus_protocols.h b/drivers/staging/greybus/greybus_protocols.h
index edbc5dfc448f..7628c1851292 100644
--- a/drivers/staging/greybus/greybus_protocols.h
+++ b/drivers/staging/greybus/greybus_protocols.h
@@ -1935,11 +1935,11 @@ struct gb_lights_get_flash_fault_response {
#define GB_AUDIO_TYPE_GET_PCM 0x08
#define GB_AUDIO_TYPE_SET_PCM 0x09
#define GB_AUDIO_TYPE_SET_TX_DATA_SIZE 0x0a
-#define GB_AUDIO_TYPE_GET_TX_DELAY 0x0b
+ /* 0x0b unused */
#define GB_AUDIO_TYPE_ACTIVATE_TX 0x0c
#define GB_AUDIO_TYPE_DEACTIVATE_TX 0x0d
#define GB_AUDIO_TYPE_SET_RX_DATA_SIZE 0x0e
-#define GB_AUDIO_TYPE_GET_RX_DELAY 0x0f
+ /* 0x0f unused */
#define GB_AUDIO_TYPE_ACTIVATE_RX 0x10
#define GB_AUDIO_TYPE_DEACTIVATE_RX 0x11
#define GB_AUDIO_TYPE_JACK_EVENT 0x12
@@ -2227,14 +2227,6 @@ struct gb_audio_set_tx_data_size_request {
__le16 size;
} __packed;
-struct gb_audio_get_tx_delay_request {
- __le16 data_cport;
-} __packed;
-
-struct gb_audio_get_tx_delay_response {
- __le32 delay;
-} __packed;
-
struct gb_audio_activate_tx_request {
__le16 data_cport;
} __packed;
@@ -2248,14 +2240,6 @@ struct gb_audio_set_rx_data_size_request {
__le16 size;
} __packed;
-struct gb_audio_get_rx_delay_request {
- __le16 data_cport;
-} __packed;
-
-struct gb_audio_get_rx_delay_response {
- __le32 delay;
-} __packed;
-
struct gb_audio_activate_rx_request {
__le16 data_cport;
} __packed;