summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--drivers/staging/greybus/audio_codec.c12
-rw-r--r--drivers/staging/greybus/audio_codec.h16
-rw-r--r--drivers/staging/greybus/audio_gb.c18
3 files changed, 23 insertions, 23 deletions
diff --git a/drivers/staging/greybus/audio_codec.c b/drivers/staging/greybus/audio_codec.c
index c9e198957f07..5ce2542a2fa0 100644
--- a/drivers/staging/greybus/audio_codec.c
+++ b/drivers/staging/greybus/audio_codec.c
@@ -46,7 +46,7 @@ static int gbaudio_module_enable_tx(struct gbaudio_codec_info *codec,
struct gbaudio_module_info *module, int id)
{
int module_state, ret = 0;
- uint16_t data_cport, i2s_port, cportid;
+ u16 data_cport, i2s_port, cportid;
u8 sig_bits, channels;
uint32_t format, rate;
struct gbaudio_data_connection *data;
@@ -131,7 +131,7 @@ static int gbaudio_module_enable_tx(struct gbaudio_codec_info *codec,
static int gbaudio_module_disable_tx(struct gbaudio_module_info *module, int id)
{
int ret;
- uint16_t data_cport, cportid, i2s_port;
+ u16 data_cport, cportid, i2s_port;
int module_state;
struct gbaudio_data_connection *data;
@@ -181,7 +181,7 @@ static int gbaudio_module_enable_rx(struct gbaudio_codec_info *codec,
struct gbaudio_module_info *module, int id)
{
int module_state, ret = 0;
- uint16_t data_cport, i2s_port, cportid;
+ u16 data_cport, i2s_port, cportid;
u8 sig_bits, channels;
uint32_t format, rate;
struct gbaudio_data_connection *data;
@@ -266,7 +266,7 @@ static int gbaudio_module_enable_rx(struct gbaudio_codec_info *codec,
static int gbaudio_module_disable_rx(struct gbaudio_module_info *module, int id)
{
int ret;
- uint16_t data_cport, cportid, i2s_port;
+ u16 data_cport, cportid, i2s_port;
int module_state;
struct gbaudio_data_connection *data;
@@ -855,7 +855,7 @@ EXPORT_SYMBOL(gbaudio_register_module);
static void gbaudio_codec_clean_data_tx(struct gbaudio_data_connection *data)
{
- uint16_t i2s_port, cportid;
+ u16 i2s_port, cportid;
int ret;
if (list_is_singular(&gbcodec->module_list)) {
@@ -877,7 +877,7 @@ static void gbaudio_codec_clean_data_tx(struct gbaudio_data_connection *data)
static void gbaudio_codec_clean_data_rx(struct gbaudio_data_connection *data)
{
- uint16_t i2s_port, cportid;
+ u16 i2s_port, cportid;
int ret;
if (list_is_singular(&gbcodec->module_list)) {
diff --git a/drivers/staging/greybus/audio_codec.h b/drivers/staging/greybus/audio_codec.h
index fabaccc86834..ca027bd99ad7 100644
--- a/drivers/staging/greybus/audio_codec.h
+++ b/drivers/staging/greybus/audio_codec.h
@@ -231,25 +231,25 @@ extern int gb_audio_gb_enable_widget(struct gb_connection *connection,
extern int gb_audio_gb_disable_widget(struct gb_connection *connection,
u8 widget_id);
extern int gb_audio_gb_get_pcm(struct gb_connection *connection,
- uint16_t data_cport, uint32_t *format,
+ u16 data_cport, uint32_t *format,
uint32_t *rate, u8 *channels,
u8 *sig_bits);
extern int gb_audio_gb_set_pcm(struct gb_connection *connection,
- uint16_t data_cport, uint32_t format,
+ u16 data_cport, uint32_t format,
uint32_t rate, u8 channels,
u8 sig_bits);
extern int gb_audio_gb_set_tx_data_size(struct gb_connection *connection,
- uint16_t data_cport, uint16_t size);
+ u16 data_cport, u16 size);
extern int gb_audio_gb_activate_tx(struct gb_connection *connection,
- uint16_t data_cport);
+ u16 data_cport);
extern int gb_audio_gb_deactivate_tx(struct gb_connection *connection,
- uint16_t data_cport);
+ u16 data_cport);
extern int gb_audio_gb_set_rx_data_size(struct gb_connection *connection,
- uint16_t data_cport, uint16_t size);
+ u16 data_cport, u16 size);
extern int gb_audio_gb_activate_rx(struct gb_connection *connection,
- uint16_t data_cport);
+ u16 data_cport);
extern int gb_audio_gb_deactivate_rx(struct gb_connection *connection,
- uint16_t data_cport);
+ u16 data_cport);
extern int gb_audio_apbridgea_set_config(struct gb_connection *connection,
__u16 i2s_port, __u32 format,
__u32 rate, __u32 mclk_freq);
diff --git a/drivers/staging/greybus/audio_gb.c b/drivers/staging/greybus/audio_gb.c
index c386cd83ca9b..42f287dd7b84 100644
--- a/drivers/staging/greybus/audio_gb.c
+++ b/drivers/staging/greybus/audio_gb.c
@@ -17,7 +17,7 @@ int gb_audio_gb_get_topology(struct gb_connection *connection,
{
struct gb_audio_get_topology_size_response size_resp;
struct gb_audio_topology *topo;
- uint16_t size;
+ u16 size;
int ret;
ret = gb_operation_sync(connection, GB_AUDIO_TYPE_GET_TOPOLOGY_SIZE,
@@ -107,7 +107,7 @@ int gb_audio_gb_disable_widget(struct gb_connection *connection,
}
EXPORT_SYMBOL_GPL(gb_audio_gb_disable_widget);
-int gb_audio_gb_get_pcm(struct gb_connection *connection, uint16_t data_cport,
+int gb_audio_gb_get_pcm(struct gb_connection *connection, u16 data_cport,
uint32_t *format, uint32_t *rate, u8 *channels,
u8 *sig_bits)
{
@@ -131,7 +131,7 @@ int gb_audio_gb_get_pcm(struct gb_connection *connection, uint16_t data_cport,
}
EXPORT_SYMBOL_GPL(gb_audio_gb_get_pcm);
-int gb_audio_gb_set_pcm(struct gb_connection *connection, uint16_t data_cport,
+int gb_audio_gb_set_pcm(struct gb_connection *connection, u16 data_cport,
uint32_t format, uint32_t rate, u8 channels,
u8 sig_bits)
{
@@ -149,7 +149,7 @@ int gb_audio_gb_set_pcm(struct gb_connection *connection, uint16_t data_cport,
EXPORT_SYMBOL_GPL(gb_audio_gb_set_pcm);
int gb_audio_gb_set_tx_data_size(struct gb_connection *connection,
- uint16_t data_cport, uint16_t size)
+ u16 data_cport, u16 size)
{
struct gb_audio_set_tx_data_size_request req;
@@ -162,7 +162,7 @@ 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_activate_tx(struct gb_connection *connection,
- uint16_t data_cport)
+ u16 data_cport)
{
struct gb_audio_activate_tx_request req;
@@ -174,7 +174,7 @@ int gb_audio_gb_activate_tx(struct gb_connection *connection,
EXPORT_SYMBOL_GPL(gb_audio_gb_activate_tx);
int gb_audio_gb_deactivate_tx(struct gb_connection *connection,
- uint16_t data_cport)
+ u16 data_cport)
{
struct gb_audio_deactivate_tx_request req;
@@ -186,7 +186,7 @@ int gb_audio_gb_deactivate_tx(struct gb_connection *connection,
EXPORT_SYMBOL_GPL(gb_audio_gb_deactivate_tx);
int gb_audio_gb_set_rx_data_size(struct gb_connection *connection,
- uint16_t data_cport, uint16_t size)
+ u16 data_cport, u16 size)
{
struct gb_audio_set_rx_data_size_request req;
@@ -199,7 +199,7 @@ 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_activate_rx(struct gb_connection *connection,
- uint16_t data_cport)
+ u16 data_cport)
{
struct gb_audio_activate_rx_request req;
@@ -211,7 +211,7 @@ int gb_audio_gb_activate_rx(struct gb_connection *connection,
EXPORT_SYMBOL_GPL(gb_audio_gb_activate_rx);
int gb_audio_gb_deactivate_rx(struct gb_connection *connection,
- uint16_t data_cport)
+ u16 data_cport)
{
struct gb_audio_deactivate_rx_request req;
generated by cgit (git 2.34.1) at 2024-06-28 07:41:45 +0000