ALSA: firewire-lib: Avoid -Wflex-array-member-not-at-end warning
PATCH v2 1/1 ALSA: firewire-lib: Avoid -Wflex-array-member-not-at-end warning
Use the DEFINE_FLEX() helper for an on-stack definition of a flexible structure where the size of the flexible-array member is known at compile-time, and refactor the rest of the code, accordingly.
So, with these changes, fix the following warning:sound/firewire/amdtp-stream.c:1184:46: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]
---
Changes in v2:
- Use DEFINE_FLEX() helper instead of a new tagged struct.
sound/firewire/amdtp-stream.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
sound/firewire/amdtp-stream.c +4 -6
@@ -1180,13 +1180,11 @@ static void process_rx_packets(struct fw_iso_context *context, u32 tstamp, size_ (void )fw_card_read_cycle_time (fw_parent_device (s->unit)->card, &curr_cycle_time);for (i =0 ; i < packets; ++i) { -struct { -struct fw_iso_packet params; -__be32 header[CIP_HEADER_QUADLETS ]; - } template = { {0 }, {0 } }; + DEFINE_FLEX(struct fw_iso_packet, template, header, + header_length, CIP_HEADER_QUADLETS);bool sched_irq = false; -build_it_pkt_header (s, desc->cycle, &template.params, pkt_header_length, +build_it_pkt_header (s, desc->cycle, template, pkt_header_length, desc->data_blocks, desc->data_block_counter, desc->syt, i, curr_cycle_time);
@@ -1198,7 +1196,7 @@ static void process_rx_packets(struct fw_iso_context *context, u32 tstamp, size_ } } -if (queue_out_packet (s, &template.params, sched_irq) <0 ) { +if (queue_out_packet (s, template, sched_irq) <0 ) {cancel_stream (s);return ; }
Signature · 1 line
2.34.1
Hi,
Quoted 14 lines · Gustavo A. R. Silva
Use the
DEFINE_FLEX()helper for an on-stack definition of a flexible structure where the size of the flexible-array member is known at compile-time, and refactor the rest of the code, accordingly.So, with these changes, fix the following warning:
sound/firewire/amdtp-stream.c:1184:46: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]---
Changes in v2:
- UseDEFINE_FLEX()helper instead of a new tagged struct.
Quoted 5 lines
sound/firewire/amdtp-stream.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-)
It looks good to me.
I remark that the change requires a commit d8e45f2929b9 "overflow: Change DEFINE_FLEX to take __counted_by member"), added to v6.9-rc1.
Thanks
Takashi Sakamoto
Quoted 9 lines · Gustavo A. R. Silva
Use the
DEFINE_FLEX()helper for an on-stack definition of a flexible structure where the size of the flexible-array member is known at compile-time, and refactor the rest of the code, accordingly.So, with these changes, fix the following warning:
sound/firewire/amdtp-stream.c:1184:46: warning: structure containing a flexible array member is not at the end of another structure [-Wflex-array-member-not-at-end]
Quoted 8 lines
---
Changes in v2:
- UseDEFINE_FLEX()helper instead of a new tagged struct.
Applied now. Thanks.
Takashi