Commit 8f60ce76 authored by Mark Greer's avatar Mark Greer Committed by Greg Kroah-Hartman
Browse files

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: default avatarMark Greer <mgreer@animalcreek.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parent ccc57e20

drivers/staging/greybus/audio_codec.h

+0 −4
Original line number Diff line number Diff line
@@ -235,16 +235,12 @@ extern int gb_audio_gb_set_pcm(struct gb_connection *connection, 
			       uint8_t sig_bits);

extern int gb_audio_gb_set_tx_data_size(struct gb_connection *connection,

					uint16_t data_cport, uint16_t size);

extern int gb_audio_gb_get_tx_delay(struct gb_connection *connection,

				    uint16_t data_cport, uint32_t *delay);

extern int gb_audio_gb_activate_tx(struct gb_connection *connection,

				   uint16_t data_cport);

extern int gb_audio_gb_deactivate_tx(struct gb_connection *connection,

				     uint16_t data_cport);

extern int gb_audio_gb_set_rx_data_size(struct gb_connection *connection,

					uint16_t data_cport, uint16_t size);

extern int gb_audio_gb_get_rx_delay(struct gb_connection *connection,

				    uint16_t data_cport, uint32_t *delay);

extern int gb_audio_gb_activate_rx(struct gb_connection *connection,

				   uint16_t data_cport);

extern int gb_audio_gb_deactivate_rx(struct gb_connection *connection,

drivers/staging/greybus/audio_gb.c

+0 −40
Original line number Diff line number Diff line
@@ -161,26 +161,6 @@ int gb_audio_gb_set_tx_data_size(struct gb_connection *connection, 
}

EXPORT_SYMBOL_GPL(gb_audio_gb_set_tx_data_size);



int gb_audio_gb_get_tx_delay(struct gb_connection *connection,

			     uint16_t data_cport, uint32_t *delay)

{

	struct gb_audio_get_tx_delay_request req;

	struct gb_audio_get_tx_delay_response resp;

	int ret;



	req.data_cport = cpu_to_le16(data_cport);



	ret = gb_operation_sync(connection, GB_AUDIO_TYPE_GET_TX_DELAY,

				&req, sizeof(req), &resp, sizeof(resp));

	if (ret)

		return ret;



	*delay = le32_to_cpu(resp.delay);



	return 0;

}

EXPORT_SYMBOL_GPL(gb_audio_gb_get_tx_delay);



int gb_audio_gb_activate_tx(struct gb_connection *connection,

			    uint16_t data_cport)

{
@@ -218,26 +198,6 @@ int gb_audio_gb_set_rx_data_size(struct gb_connection *connection, 
}

EXPORT_SYMBOL_GPL(gb_audio_gb_set_rx_data_size);



int gb_audio_gb_get_rx_delay(struct gb_connection *connection,

			     uint16_t data_cport, uint32_t *delay)

{

	struct gb_audio_get_rx_delay_request req;

	struct gb_audio_get_rx_delay_response resp;

	int ret;



	req.data_cport = cpu_to_le16(data_cport);



	ret = gb_operation_sync(connection, GB_AUDIO_TYPE_GET_RX_DELAY,

				&req, sizeof(req), &resp, sizeof(resp));

	if (ret)

		return ret;



	*delay = le32_to_cpu(resp.delay);



	return 0;

}

EXPORT_SYMBOL_GPL(gb_audio_gb_get_rx_delay);



int gb_audio_gb_activate_rx(struct gb_connection *connection,

			    uint16_t data_cport)

{

drivers/staging/greybus/greybus_protocols.h

+2 −18
Original line number Diff line number Diff line
@@ -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;