Skip to content

Commit e244953

Browse files
committed
ALSA: mixart: Replace with __packed attribute
Replace the old __attribute__((packed)) with the new __packed. Only cleanup, no functional changes. Link: https://lore.kernel.org/r/20231025132314.5878-6-tiwai@suse.de Signed-off-by: Takashi Iwai <tiwai@suse.de>
1 parent afcd82a commit e244953

1 file changed

Lines changed: 35 additions & 35 deletions

File tree

sound/pci/mixart/mixart_core.h

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ struct mixart_enum_connector_resp
6868
u32 uid_count;
6969
u32 current_uid_index;
7070
struct mixart_uid uid[MIXART_MAX_PHYS_CONNECTORS];
71-
} __attribute__((packed));
71+
} __packed;
7272

7373

7474
/* used for following struct */
@@ -81,7 +81,7 @@ struct mixart_audio_info_req
8181
u32 line_max_level; /* float */
8282
u32 micro_max_level; /* float */
8383
u32 cd_max_level; /* float */
84-
} __attribute__((packed));
84+
} __packed;
8585

8686
struct mixart_analog_hw_info
8787
{
@@ -93,15 +93,15 @@ struct mixart_analog_hw_info
9393
u32 step_var_level; /* float */
9494
u32 fix_gain; /* float */
9595
u32 zero_var; /* float */
96-
} __attribute__((packed));
96+
} __packed;
9797

9898
struct mixart_digital_hw_info
9999
{
100100
u32 hw_connection_type;
101101
u32 presence;
102102
u32 clock;
103103
u32 reserved;
104-
} __attribute__((packed));
104+
} __packed;
105105

106106
struct mixart_analog_info
107107
{
@@ -110,27 +110,27 @@ struct mixart_analog_info
110110
struct mixart_analog_hw_info line_info;
111111
struct mixart_analog_hw_info cd_info;
112112
u32 analog_level_present;
113-
} __attribute__((packed));
113+
} __packed;
114114

115115
struct mixart_digital_info
116116
{
117117
u32 type_mask;
118118
struct mixart_digital_hw_info aes_info;
119119
struct mixart_digital_hw_info adat_info;
120-
} __attribute__((packed));
120+
} __packed;
121121

122122
struct mixart_audio_info
123123
{
124124
u32 clock_type_mask;
125125
struct mixart_analog_info analog_info;
126126
struct mixart_digital_info digital_info;
127-
} __attribute__((packed));
127+
} __packed;
128128

129129
struct mixart_audio_info_resp
130130
{
131131
u32 txx_status;
132132
struct mixart_audio_info info;
133-
} __attribute__((packed));
133+
} __packed;
134134

135135

136136
/* used for nb_bytes_max_per_sample */
@@ -142,7 +142,7 @@ struct mixart_stream_info
142142
u32 size_max_byte_frame;
143143
u32 size_max_sample_frame;
144144
u32 nb_bytes_max_per_sample; /* float */
145-
} __attribute__((packed));
145+
} __packed;
146146

147147
/* MSG_STREAM_ADD_INPUT_GROUP */
148148
/* MSG_STREAM_ADD_OUTPUT_GROUP */
@@ -157,13 +157,13 @@ struct mixart_streaming_group_req
157157
struct mixart_stream_info stream_info[32];
158158
struct mixart_uid connector;
159159
u32 flow_entry[32];
160-
} __attribute__((packed));
160+
} __packed;
161161

162162
struct mixart_stream_desc
163163
{
164164
struct mixart_uid stream_uid;
165165
u32 stream_desc;
166-
} __attribute__((packed));
166+
} __packed;
167167

168168
struct mixart_streaming_group
169169
{
@@ -172,7 +172,7 @@ struct mixart_streaming_group
172172
u32 pipe_desc;
173173
u32 stream_count;
174174
struct mixart_stream_desc stream[32];
175-
} __attribute__((packed));
175+
} __packed;
176176

177177
/* MSG_STREAM_DELETE_GROUP */
178178

@@ -182,7 +182,7 @@ struct mixart_delete_group_resp
182182
{
183183
u32 status;
184184
u32 unused[2];
185-
} __attribute__((packed));
185+
} __packed;
186186

187187

188188
/* MSG_STREAM_START_INPUT_STAGE_PACKET = 0x130000 + 7,
@@ -195,22 +195,22 @@ struct mixart_fx_couple_uid
195195
{
196196
struct mixart_uid uid_fx_code;
197197
struct mixart_uid uid_fx_data;
198-
} __attribute__((packed));
198+
} __packed;
199199

200200
struct mixart_txx_stream_desc
201201
{
202202
struct mixart_uid uid_pipe;
203203
u32 stream_idx;
204204
u32 fx_number;
205205
struct mixart_fx_couple_uid uid_fx[4];
206-
} __attribute__((packed));
206+
} __packed;
207207

208208
struct mixart_flow_info
209209
{
210210
struct mixart_txx_stream_desc stream_desc;
211211
u32 flow_entry;
212212
u32 flow_phy_addr;
213-
} __attribute__((packed));
213+
} __packed;
214214

215215
struct mixart_stream_state_req
216216
{
@@ -219,7 +219,7 @@ struct mixart_stream_state_req
219219
u32 reserved4np[3];
220220
u32 stream_count; /* set to 1 for instance */
221221
struct mixart_flow_info stream_info; /* could be an array[stream_count] */
222-
} __attribute__((packed));
222+
} __packed;
223223

224224
/* MSG_STREAM_START_STREAM_GRP_PACKET = 0x130000 + 6
225225
MSG_STREAM_STOP_STREAM_GRP_PACKET = 0x130000 + 9
@@ -232,13 +232,13 @@ struct mixart_group_state_req
232232
u32 reserved4np[2];
233233
u32 pipe_count; /* set to 1 for instance */
234234
struct mixart_uid pipe_uid; /* could be an array[pipe_count], in theory */
235-
} __attribute__((packed));
235+
} __packed;
236236

237237
struct mixart_group_state_resp
238238
{
239239
u32 txx_status;
240240
u64 scheduler;
241-
} __attribute__((packed));
241+
} __packed;
242242

243243

244244

@@ -250,7 +250,7 @@ struct mixart_sample_pos
250250
u32 validity;
251251
u32 sample_pos_high_part;
252252
u32 sample_pos_low_part;
253-
} __attribute__((packed));
253+
} __packed;
254254

255255
/*
256256
* This structure is limited by the size of MSG_DEFAULT_SIZE. Instead of
@@ -263,7 +263,7 @@ struct mixart_timer_notify
263263
{
264264
u32 stream_count;
265265
struct mixart_sample_pos streams[MIXART_MAX_TIMER_NOTIFY_STREAMS];
266-
} __attribute__((packed));
266+
} __packed;
267267

268268

269269
/* MSG_CONSOLE_GET_CLOCK_UID = 0x070003,
@@ -275,7 +275,7 @@ struct mixart_return_uid
275275
{
276276
u32 error_code;
277277
struct mixart_uid uid;
278-
} __attribute__((packed));
278+
} __packed;
279279

280280
/* MSG_CLOCK_CHECK_PROPERTIES = 0x200001,
281281
MSG_CLOCK_SET_PROPERTIES = 0x200002,
@@ -315,13 +315,13 @@ struct mixart_clock_properties
315315
u32 board_mask;
316316
u32 nb_callers; /* set to 1 (see below) */
317317
struct mixart_uid uid_caller;
318-
} __attribute__((packed));
318+
} __packed;
319319

320320
struct mixart_clock_properties_resp
321321
{
322322
u32 status;
323323
u32 clock_mode;
324-
} __attribute__((packed));
324+
} __packed;
325325

326326

327327
/* MSG_STREAM_SET_INPUT_STAGE_PARAM = 0x13000F */
@@ -402,7 +402,7 @@ struct mixart_stream_param_desc
402402
u32 pipe_count; /* set to 1 (array size !) */
403403
u32 stream_count; /* set to 1 (array size !) */
404404
struct mixart_txx_stream_desc stream_desc; /* only one stream per command, but this could be an array, in theory */
405-
} __attribute__((packed));
405+
} __packed;
406406

407407

408408
/* MSG_CONNECTOR_GET_OUT_AUDIO_LEVEL = 0x050009,
@@ -418,7 +418,7 @@ struct mixart_get_out_audio_level
418418
u32 mute;
419419
u32 monitor_mute1;
420420
u32 monitor_mute2;
421-
} __attribute__((packed));
421+
} __packed;
422422

423423

424424
/* MSG_CONNECTOR_SET_OUT_AUDIO_LEVEL = 0x05000A,
@@ -445,7 +445,7 @@ struct mixart_set_out_audio_level
445445
u32 monitor_mute1;
446446
u32 monitor_mute2;
447447
u32 reserved4np;
448-
} __attribute__((packed));
448+
} __packed;
449449

450450

451451
/* MSG_SYSTEM_ENUM_PHYSICAL_IO = 0x16000E,
@@ -460,7 +460,7 @@ struct mixart_uid_enumeration
460460
u32 nb_uid;
461461
u32 current_uid_index;
462462
struct mixart_uid uid[MIXART_MAX_PHYS_IO];
463-
} __attribute__((packed));
463+
} __packed;
464464

465465

466466
/* MSG_PHYSICALIO_SET_LEVEL = 0x0F0008,
@@ -471,13 +471,13 @@ struct mixart_io_channel_level
471471
{
472472
u32 analog_level; /* float */
473473
u32 unused[2];
474-
} __attribute__((packed));
474+
} __packed;
475475

476476
struct mixart_io_level
477477
{
478478
s32 channel; /* 0=left, 1=right, -1=both, -2=both same */
479479
struct mixart_io_channel_level level[2];
480-
} __attribute__((packed));
480+
} __packed;
481481

482482

483483
/* MSG_STREAM_SET_IN_AUDIO_LEVEL = 0x130015,
@@ -490,7 +490,7 @@ struct mixart_in_audio_level_info
490490
u32 valid_mask2;
491491
u32 digital_level;
492492
u32 analog_level;
493-
} __attribute__((packed));
493+
} __packed;
494494

495495
struct mixart_set_in_audio_level_req
496496
{
@@ -499,7 +499,7 @@ struct mixart_set_in_audio_level_req
499499
u32 audio_count; /* set to <= 2 */
500500
u32 reserved4np;
501501
struct mixart_in_audio_level_info level[2];
502-
} __attribute__((packed));
502+
} __packed;
503503

504504
/* response is a 32 bit status */
505505

@@ -529,13 +529,13 @@ struct mixart_out_stream_level_info
529529
u32 digital_level2;
530530
u32 mute1;
531531
u32 mute2;
532-
} __attribute__((packed));
532+
} __packed;
533533

534534
struct mixart_set_out_stream_level
535535
{
536536
struct mixart_txx_stream_desc desc;
537537
struct mixart_out_stream_level_info out_level;
538-
} __attribute__((packed));
538+
} __packed;
539539

540540
struct mixart_set_out_stream_level_req
541541
{
@@ -544,7 +544,7 @@ struct mixart_set_out_stream_level_req
544544
u32 reserved4np[2];
545545
u32 nb_of_stream; /* set to 1 */
546546
struct mixart_set_out_stream_level stream_level; /* could be an array */
547-
} __attribute__((packed));
547+
} __packed;
548548

549549
/* response to this request is a u32 status value */
550550

0 commit comments

Comments
 (0)