1 files changed, 42 insertions, 78 deletions

diff --git a/sound/pci/mixart/mixart_core.h b/sound/pci/mixart/mixart_core.h
index 99450eba15c0..1fe2bcfcc57c 100644
--- a/sound/pci/mixart/mixart_core.h
+++ b/sound/pci/mixart/mixart_core.h
@@ -63,25 +63,23 @@ enum mixart_message_id {
 };
 
 
-typedef struct mixart_msg mixart_msg_t;
 struct mixart_msg
 {
         u32          message_id;
-        mixart_uid_t uid;
+        struct mixart_uid uid;
         void*        data;
         size_t       size;
 };
 
 /* structs used to communicate with miXart */
 
-typedef struct mixart_enum_connector_resp mixart_enum_connector_resp_t;
 struct mixart_enum_connector_resp
 {
         u32  error_code;
         u32  first_uid_offset;
         u32  uid_count;
         u32  current_uid_index;
-        mixart_uid_t uid[MIXART_MAX_PHYS_CONNECTORS];
+        struct mixart_uid uid[MIXART_MAX_PHYS_CONNECTORS];
 } __attribute__((packed));
 
 
@@ -90,7 +88,6 @@ struct mixart_enum_connector_resp
 #define MIXART_FLOAT_M_20_0_TO_HEX      0xc1a00000  /* -20.0f */
 #define MIXART_FLOAT____0_0_TO_HEX      0x00000000  /* 0.0f */
 
-typedef struct mixart_audio_info_req mixart_audio_info_req_t;
 struct mixart_audio_info_req
 {
         u32 line_max_level;    /* float */
@@ -98,7 +95,6 @@ struct mixart_audio_info_req
         u32 cd_max_level;      /* float */
 } __attribute__((packed));
 
-typedef struct mixart_analog_hw_info mixart_analog_hw_info_t;
 struct mixart_analog_hw_info
 {
         u32 is_present;
@@ -111,7 +107,6 @@ struct mixart_analog_hw_info
         u32 zero_var;          /* float */
 } __attribute__((packed));
 
-typedef struct mixart_digital_hw_info mixart_digital_hw_info_t;
 struct mixart_digital_hw_info
 {
         u32   hw_connection_type;
@@ -120,37 +115,33 @@ struct mixart_digital_hw_info
         u32   reserved;
 } __attribute__((packed));
 
-typedef struct mixart_analog_info mixart_analog_info_t;
 struct mixart_analog_info
 {
         u32                     type_mask;
-        mixart_analog_hw_info_t micro_info;
-        mixart_analog_hw_info_t line_info;
-        mixart_analog_hw_info_t cd_info;
+        struct mixart_analog_hw_info micro_info;
+        struct mixart_analog_hw_info line_info;
+        struct mixart_analog_hw_info cd_info;
         u32                     analog_level_present;
 } __attribute__((packed));
 
-typedef struct mixart_digital_info mixart_digital_info_t;
 struct mixart_digital_info
 {
         u32 type_mask;
-        mixart_digital_hw_info_t aes_info;
-        mixart_digital_hw_info_t adat_info;
+        struct mixart_digital_hw_info aes_info;
+        struct mixart_digital_hw_info adat_info;
 } __attribute__((packed));
 
-typedef struct mixart_audio_info mixart_audio_info_t;
 struct mixart_audio_info
 {
         u32                   clock_type_mask;
-        mixart_analog_info_t  analog_info;
-        mixart_digital_info_t digital_info;
+        struct mixart_analog_info  analog_info;
+        struct mixart_digital_info digital_info;
 } __attribute__((packed));
 
-typedef struct mixart_audio_info_resp mixart_audio_info_resp_t;
 struct mixart_audio_info_resp
 {
         u32                 txx_status;
-        mixart_audio_info_t info;
+        struct mixart_audio_info info;
 } __attribute__((packed));
 
 
@@ -158,7 +149,6 @@ struct mixart_audio_info_resp
 #define MIXART_FLOAT_P__4_0_TO_HEX      0x40800000  /* +4.0f */
 #define MIXART_FLOAT_P__8_0_TO_HEX      0x41000000  /* +8.0f */
 
-typedef struct mixart_stream_info mixart_stream_info_t;
 struct mixart_stream_info
 {
         u32 size_max_byte_frame;
@@ -169,7 +159,6 @@ struct mixart_stream_info
 /*  MSG_STREAM_ADD_INPUT_GROUP */
 /*  MSG_STREAM_ADD_OUTPUT_GROUP */
 
-typedef struct mixart_streaming_group_req mixart_streaming_group_req_t;
 struct mixart_streaming_group_req
 {
         u32 stream_count;
@@ -177,33 +166,30 @@ struct mixart_streaming_group_req
         u32 user_grp_number;
         u32 first_phys_audio;
         u32 latency;
-        mixart_stream_info_t stream_info[32];
-        mixart_uid_t connector;
+        struct mixart_stream_info stream_info[32];
+        struct mixart_uid connector;
         u32 flow_entry[32];
 } __attribute__((packed));
 
-typedef struct mixart_stream_desc mixart_stream_desc_t;
 struct mixart_stream_desc
 {
-        mixart_uid_t stream_uid;
+        struct mixart_uid stream_uid;
         u32          stream_desc;
 } __attribute__((packed));
 
-typedef struct mixart_streaming_group mixart_streaming_group_t;
 struct mixart_streaming_group
 {
         u32                  status;
-        mixart_uid_t         group;
+        struct mixart_uid    group;
         u32                  pipe_desc;
         u32                  stream_count;
-        mixart_stream_desc_t stream[32];
+        struct mixart_stream_desc stream[32];
 } __attribute__((packed));
 
 /* MSG_STREAM_DELETE_GROUP */
 
 /* request : mixart_uid_t group */
 
-typedef struct mixart_delete_group_resp mixart_delete_group_resp_t;
 struct mixart_delete_group_resp
 {
         u32  status;
@@ -217,55 +203,49 @@ struct mixart_delete_group_resp
         MSG_STREAM_STOP_OUTPUT_STAGE_PACKET  = 0x130000 + 11,
  */
 
-typedef struct mixart_fx_couple_uid mixart_fx_couple_uid_t;
 struct mixart_fx_couple_uid
 {
-        mixart_uid_t uid_fx_code;
-        mixart_uid_t uid_fx_data;
+        struct mixart_uid uid_fx_code;
+        struct mixart_uid uid_fx_data;
 } __attribute__((packed));
 
-typedef struct mixart_txx_stream_desc mixart_txx_stream_desc_t;
 struct mixart_txx_stream_desc
 {
-        mixart_uid_t            uid_pipe;
+        struct mixart_uid       uid_pipe;
         u32                     stream_idx;
         u32                     fx_number;
-        mixart_fx_couple_uid_t  uid_fx[4];
+        struct mixart_fx_couple_uid  uid_fx[4];
 } __attribute__((packed));
 
-typedef struct mixart_flow_info mixart_flow_info_t;
 struct mixart_flow_info
 {
-        mixart_txx_stream_desc_t  stream_desc;
+        struct mixart_txx_stream_desc  stream_desc;
         u32                       flow_entry;
         u32                       flow_phy_addr;
 } __attribute__((packed));
 
-typedef struct mixart_stream_state_req mixart_stream_state_req_t;
 struct mixart_stream_state_req
 {
         u32                 delayed;
         u64                 scheduler;
         u32                 reserved4np[3];
         u32                 stream_count;  /* set to 1 for instance */
-        mixart_flow_info_t  stream_info;   /* could be an array[stream_count] */
+        struct mixart_flow_info  stream_info;   /* could be an array[stream_count] */
 } __attribute__((packed));
 
 /*      MSG_STREAM_START_STREAM_GRP_PACKET   = 0x130000 + 6
         MSG_STREAM_STOP_STREAM_GRP_PACKET    = 0x130000 + 9
  */
 
-typedef struct mixart_group_state_req mixart_group_state_req_t;
 struct mixart_group_state_req
 {
         u32           delayed;
         u64           scheduler;
         u32           reserved4np[2];
         u32           pipe_count;    /* set to 1 for instance */
-        mixart_uid_t  pipe_uid[1];   /* could be an array[pipe_count] */
+        struct mixart_uid  pipe_uid[1];   /* could be an array[pipe_count] */
 } __attribute__((packed));
 
-typedef struct mixart_group_state_resp mixart_group_state_resp_t;
 struct mixart_group_state_resp
 {
         u32           txx_status;
@@ -276,7 +256,6 @@ struct mixart_group_state_resp
 
 /* Structures used by the MSG_SERVICES_TIMER_NOTIFY command */
 
-typedef struct mixart_sample_pos mixart_sample_pos_t;
 struct mixart_sample_pos
 {
         u32   buffer_id;
@@ -285,11 +264,10 @@ struct mixart_sample_pos
         u32   sample_pos_low_part;
 } __attribute__((packed));
 
-typedef struct mixart_timer_notify mixart_timer_notify_t;
 struct mixart_timer_notify
 {
         u32                  stream_count;
-        mixart_sample_pos_t  streams[MIXART_MAX_STREAM_PER_CARD * MIXART_MAX_CARDS];
+        struct mixart_sample_pos  streams[MIXART_MAX_STREAM_PER_CARD * MIXART_MAX_CARDS];
 } __attribute__((packed));
 
 
@@ -298,11 +276,10 @@ struct mixart_timer_notify
 
 /* request is a uid with desc = MSG_CONSOLE_MANAGER | cardindex */
 
-typedef struct mixart_return_uid mixart_return_uid_t;
 struct mixart_return_uid
 {
         u32 error_code;
-        mixart_uid_t uid;
+        struct mixart_uid uid;
 } __attribute__((packed));
 
 /*      MSG_CLOCK_CHECK_PROPERTIES           = 0x200001,
@@ -327,7 +304,6 @@ enum mixart_clock_mode {
 };
 
 
-typedef struct mixart_clock_properties mixart_clock_properties_t;
 struct mixart_clock_properties
 {
         u32 error_code;
@@ -336,17 +312,16 @@ struct mixart_clock_properties
         u32 reference_frequency;
         u32 clock_generic_type;
         u32 clock_mode;
-        mixart_uid_t uid_clock_source;
-        mixart_uid_t uid_event_source;
+        struct mixart_uid uid_clock_source;
+        struct mixart_uid uid_event_source;
         u32 event_mode;
         u32 synchro_signal_presence;
         u32 format;
         u32 board_mask;
         u32 nb_callers; /* set to 1 (see below) */
-        mixart_uid_t uid_caller[1];
+        struct mixart_uid uid_caller[1];
 } __attribute__((packed));
 
-typedef struct mixart_clock_properties_resp mixart_clock_properties_resp_t;
 struct mixart_clock_properties_resp
 {
         u32 status;
@@ -388,7 +363,6 @@ enum mixart_sample_type {
         ST_INTEGER_32LE
 };
 
-typedef struct mixart_stream_param_desc mixart_stream_param_desc_t;
 struct mixart_stream_param_desc
 {
         u32 coding_type;  /* use enum mixart_coding_type */
@@ -432,7 +406,7 @@ struct mixart_stream_param_desc
         u32 reserved4np[3];
         u32 pipe_count;                           /* set to 1 (array size !) */
         u32 stream_count;                         /* set to 1 (array size !) */
-        mixart_txx_stream_desc_t stream_desc[1];  /* only one stream per command, but this could be an array */
+        struct mixart_txx_stream_desc stream_desc[1];  /* only one stream per command, but this could be an array */
 
 } __attribute__((packed));
 
@@ -441,7 +415,6 @@ struct mixart_stream_param_desc
  */
 
 
-typedef struct mixart_get_out_audio_level mixart_get_out_audio_level_t;
 struct mixart_get_out_audio_level
 {
         u32 txx_status;
@@ -465,7 +438,6 @@ struct mixart_get_out_audio_level
 #define MIXART_AUDIO_LEVEL_MUTE_M1_MASK 0x10
 #define MIXART_AUDIO_LEVEL_MUTE_M2_MASK 0x20
 
-typedef struct mixart_set_out_audio_level mixart_set_out_audio_level_t;
 struct mixart_set_out_audio_level
 {
         u32 delayed;
@@ -487,14 +459,13 @@ struct mixart_set_out_audio_level
 
 #define MIXART_MAX_PHYS_IO  (MIXART_MAX_CARDS * 2 * 2) /* 4 * (analog+digital) * (playback+capture) */
 
-typedef struct mixart_uid_enumeration mixart_uid_enumeration_t;
 struct mixart_uid_enumeration
 {
         u32 error_code;
         u32 first_uid_offset;
         u32 nb_uid;
         u32 current_uid_index;
-        mixart_uid_t uid[MIXART_MAX_PHYS_IO];
+        struct mixart_uid uid[MIXART_MAX_PHYS_IO];
 } __attribute__((packed));
 
 
@@ -502,42 +473,38 @@ struct mixart_uid_enumeration
         MSG_PHYSICALIO_GET_LEVEL             = 0x0F000C,
 */
 
-typedef struct mixart_io_channel_level mixart_io_channel_level_t;
 struct mixart_io_channel_level
 {
         u32 analog_level;   /* float */
         u32 unused[2];
 } __attribute__((packed));
 
-typedef struct mixart_io_level mixart_io_level_t;
 struct mixart_io_level
 {
         s32 channel; /* 0=left, 1=right, -1=both, -2=both same */
-        mixart_io_channel_level_t level[2];
+        struct mixart_io_channel_level level[2];
 } __attribute__((packed));
 
 
 /*      MSG_STREAM_SET_IN_AUDIO_LEVEL        = 0x130015,
  */
 
-typedef struct mixart_in_audio_level_info mixart_in_audio_level_info_t;
 struct mixart_in_audio_level_info
 {
-        mixart_uid_t connector;
+        struct mixart_uid connector;
         u32 valid_mask1;
         u32 valid_mask2;
         u32 digital_level;
         u32 analog_level;
 } __attribute__((packed));
 
-typedef struct mixart_set_in_audio_level_req mixart_set_in_audio_level_req_t;
 struct mixart_set_in_audio_level_req
 {
         u32 delayed;
         u64 scheduler;
         u32 audio_count;  /* set to <= 2 */
         u32 reserved4np;
-        mixart_in_audio_level_info_t level[2];
+        struct mixart_in_audio_level_info level[2];
 } __attribute__((packed));
 
 /* response is a 32 bit status */
@@ -556,7 +523,6 @@ struct mixart_set_in_audio_level_req
 #define MIXART_OUT_STREAM_SET_LEVEL_MUTE_1              0x40
 #define MIXART_OUT_STREAM_SET_LEVEL_MUTE_2              0x80
 
-typedef struct mixart_out_stream_level_info mixart_out_stream_level_info_t;
 struct mixart_out_stream_level_info
 {
         u32 valid_mask1;
@@ -571,37 +537,35 @@ struct mixart_out_stream_level_info
         u32 mute2;
 } __attribute__((packed));
 
-typedef struct mixart_set_out_stream_level mixart_set_out_stream_level_t;
 struct mixart_set_out_stream_level
 {
-        mixart_txx_stream_desc_t desc;
-        mixart_out_stream_level_info_t out_level;
+        struct mixart_txx_stream_desc desc;
+        struct mixart_out_stream_level_info out_level;
 } __attribute__((packed));
 
-typedef struct mixart_set_out_stream_level_req mixart_set_out_stream_level_req_t;
 struct mixart_set_out_stream_level_req
 {
         u32 delayed;
         u64 scheduler;
         u32 reserved4np[2];
         u32 nb_of_stream;  /* set to 1 */
-        mixart_set_out_stream_level_t stream_level; /* could be an array */
+        struct mixart_set_out_stream_level stream_level; /* could be an array */
 } __attribute__((packed));
 
 /* response to this request is a u32 status value */
 
 
 /* exported */
-void snd_mixart_init_mailbox(mixart_mgr_t *mgr);
-void snd_mixart_exit_mailbox(mixart_mgr_t *mgr);
+void snd_mixart_init_mailbox(struct mixart_mgr *mgr);
+void snd_mixart_exit_mailbox(struct mixart_mgr *mgr);
 
-int  snd_mixart_send_msg(mixart_mgr_t *mgr, mixart_msg_t *request, int max_resp_size, void *resp_data);
-int  snd_mixart_send_msg_wait_notif(mixart_mgr_t *mgr, mixart_msg_t *request, u32 notif_event);
-int  snd_mixart_send_msg_nonblock(mixart_mgr_t *mgr, mixart_msg_t *request);
+int  snd_mixart_send_msg(struct mixart_mgr *mgr, struct mixart_msg *request, int max_resp_size, void *resp_data);
+int  snd_mixart_send_msg_wait_notif(struct mixart_mgr *mgr, struct mixart_msg *request, u32 notif_event);
+int  snd_mixart_send_msg_nonblock(struct mixart_mgr *mgr, struct mixart_msg *request);
 
 irqreturn_t snd_mixart_interrupt(int irq, void *dev_id, struct pt_regs *regs);
-void snd_mixart_msg_tasklet( unsigned long arg);
+void snd_mixart_msg_tasklet(unsigned long arg);
 
-void snd_mixart_reset_board(mixart_mgr_t *mgr);
+void snd_mixart_reset_board(struct mixart_mgr *mgr);
 
 #endif /* __SOUND_MIXART_CORE_H */