greybus: audio: apbridgea: Remove GET_TX/RX_DELAY message types

The 'AUDIO_APBRIDGEA_TYPE_GET_TX_DELAY' and
'AUDIO_APBRIDGEA_TYPE_GET_RX_DELAY' message types have been
removed from the AP <-> APBrigdeA Audio Protocol so remove
them from the code.  Do not coalesce the message type numbers
to prevent compatibility issues between the AP and APBridgeA.

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>

diff --git a/drivers/staging/greybus/audio_apbridgea.c b/drivers/staging/greybus/audio_apbridgea.c
index 45d3522..1b4252d 100644 (file)
--- a/drivers/staging/greybus/audio_apbridgea.c
+++ b/drivers/staging/greybus/audio_apbridgea.c
@@ -84,14 +84,6 @@ int gb_audio_apbridgea_set_tx_data_size(struct gb_connection *connection,
 }
 EXPORT_SYMBOL_GPL(gb_audio_apbridgea_set_tx_data_size);
 
-int gb_audio_apbridgea_get_tx_delay(struct gb_connection *connection,
-                                   __u16 i2s_port, __u32 *delay)
-{
-       /* TODO: implement */
-       return -EOPNOTSUPP;
-}
-EXPORT_SYMBOL_GPL(gb_audio_apbridgea_get_tx_delay);
-
 int gb_audio_apbridgea_prepare_tx(struct gb_connection *connection,
                                  __u16 i2s_port)
 {
@@ -158,14 +150,6 @@ int gb_audio_apbridgea_set_rx_data_size(struct gb_connection *connection,
 }
 EXPORT_SYMBOL_GPL(gb_audio_apbridgea_set_rx_data_size);
 
-int gb_audio_apbridgea_get_rx_delay(struct gb_connection *connection,
-                                   __u16 i2s_port, __u32 *delay)
-{
-       /* TODO: implement */
-       return -EOPNOTSUPP;
-}
-EXPORT_SYMBOL_GPL(gb_audio_apbridgea_get_rx_delay);
-
 int gb_audio_apbridgea_prepare_rx(struct gb_connection *connection,
                                  __u16 i2s_port)
 {

diff --git a/drivers/staging/greybus/audio_apbridgea.h b/drivers/staging/greybus/audio_apbridgea.h
index a48f815..b94cb05 100644 (file)
--- a/drivers/staging/greybus/audio_apbridgea.h
+++ b/drivers/staging/greybus/audio_apbridgea.h
@@ -47,13 +47,13 @@
 #define AUDIO_APBRIDGEA_TYPE_REGISTER_CPORT            0x02
 #define AUDIO_APBRIDGEA_TYPE_UNREGISTER_CPORT          0x03
 #define AUDIO_APBRIDGEA_TYPE_SET_TX_DATA_SIZE          0x04
-#define AUDIO_APBRIDGEA_TYPE_GET_TX_DELAY              0x05
+                                                       /* 0x05 unused */
 #define AUDIO_APBRIDGEA_TYPE_PREPARE_TX                        0x06
 #define AUDIO_APBRIDGEA_TYPE_START_TX                  0x07
 #define AUDIO_APBRIDGEA_TYPE_STOP_TX                   0x08
 #define AUDIO_APBRIDGEA_TYPE_SHUTDOWN_TX               0x09
 #define AUDIO_APBRIDGEA_TYPE_SET_RX_DATA_SIZE          0x0a
-#define AUDIO_APBRIDGEA_TYPE_GET_RX_DELAY              0x0b
+                                                       /* 0x0b unused */
 #define AUDIO_APBRIDGEA_TYPE_PREPARE_RX                        0x0c
 #define AUDIO_APBRIDGEA_TYPE_START_RX                  0x0d
 #define AUDIO_APBRIDGEA_TYPE_STOP_RX                   0x0e
@@ -115,15 +115,6 @@ struct audio_apbridgea_set_tx_data_size_request {
        __le16                          size;
 } __packed;
 
-struct audio_apbridgea_get_tx_delay_request {
-       struct audio_apbridgea_hdr      hdr;
-} __packed;
-
-struct audio_apbridgea_get_tx_delay_response {
-       struct audio_apbridgea_hdr      hdr;
-       __le16                          delay;
-} __packed;
-
 struct audio_apbridgea_prepare_tx_request {
        struct audio_apbridgea_hdr      hdr;
 } __packed;
@@ -146,15 +137,6 @@ struct audio_apbridgea_set_rx_data_size_request {
        __le16                          size;
 } __packed;
 
-struct audio_apbridgea_get_rx_delay_request {
-       struct audio_apbridgea_hdr      hdr;
-} __packed;
-
-struct audio_apbridgea_get_rx_delay_response {
-       struct audio_apbridgea_hdr      hdr;
-       __le16                          delay;
-} __packed;
-
 struct audio_apbridgea_prepare_rx_request {
        struct audio_apbridgea_hdr      hdr;
 } __packed;

diff --git a/drivers/staging/greybus/audio_codec.h b/drivers/staging/greybus/audio_codec.h
index f4936f1..40de7e7 100644 (file)
--- a/drivers/staging/greybus/audio_codec.h
+++ b/drivers/staging/greybus/audio_codec.h
@@ -260,8 +260,6 @@ extern int gb_audio_apbridgea_unregister_cport(struct gb_connection *connection,
                                               __u8 direction);
 extern int gb_audio_apbridgea_set_tx_data_size(struct gb_connection *connection,
                                               __u16 i2s_port, __u16 size);
-extern int gb_audio_apbridgea_get_tx_delay(struct gb_connection *connection,
-                                          __u16 i2s_port, __u32 *delay);
 extern int gb_audio_apbridgea_prepare_tx(struct gb_connection *connection,
                                         __u16 i2s_port);
 extern int gb_audio_apbridgea_start_tx(struct gb_connection *connection,
@@ -272,8 +270,6 @@ extern int gb_audio_apbridgea_shutdown_tx(struct gb_connection *connection,
                                          __u16 i2s_port);
 extern int gb_audio_apbridgea_set_rx_data_size(struct gb_connection *connection,
                                               __u16 i2s_port, __u16 size);
-extern int gb_audio_apbridgea_get_rx_delay(struct gb_connection *connection,
-                                          __u16 i2s_port, __u32 *delay);
 extern int gb_audio_apbridgea_prepare_rx(struct gb_connection *connection,
                                         __u16 i2s_port);
 extern int gb_audio_apbridgea_start_rx(struct gb_connection *connection,