Skip to content

Commit 0258d88

Browse files
committed
firewire: fix warnings to generate UAPI documentation
Any target to generate UAPI documentation reports warnings to missing annotation for padding member in structures added recently. This commit suppresses the warnings. Reported-by: Stephen Rothwell <sfr@canb.auug.org.au> Closes: https://lore.kernel.org/lkml/20230531135306.43613a59@canb.auug.org.au/ Fixes: 7c22d4a ("firewire: cdev: add new event to notify request subaction with time stamp") Fixes: fc2b52c ("firewire: cdev: add new event to notify response subaction with time stamp") Link: https://lore.kernel.org/r/20230601144937.121179-1-o-takashi@sakamocchi.jp Signed-off-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
1 parent e003498 commit 0258d88

1 file changed

Lines changed: 6 additions & 8 deletions

File tree

include/uapi/linux/firewire-cdev.h

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,9 @@ struct fw_cdev_event_response {
130130
* @length: Data length, i.e. the response's payload size in bytes
131131
* @request_tstamp: The time stamp of isochronous cycle at which the request was sent.
132132
* @response_tstamp: The time stamp of isochronous cycle at which the response was sent.
133+
* @padding: Padding to keep the size of structure as multiples of 8 in various architectures
134+
* since 4 byte alignment is used for 8 byte of object type in System V ABI for i386
135+
* architecture.
133136
* @data: Payload data, if any
134137
*
135138
* This event is sent when the stack receives a response to an outgoing request
@@ -155,10 +158,6 @@ struct fw_cdev_event_response2 {
155158
__u32 length;
156159
__u32 request_tstamp;
157160
__u32 response_tstamp;
158-
/*
159-
* Padding to keep the size of structure as multiples of 8 in various architectures since
160-
* 4 byte alignment is used for 8 byte of object type in System V ABI for i386 architecture.
161-
*/
162161
__u32 padding;
163162
__u32 data[];
164163
};
@@ -231,6 +230,9 @@ struct fw_cdev_event_request2 {
231230
* @handle: Reference to the kernel-side pending request
232231
* @length: Data length, i.e. the request's payload size in bytes
233232
* @tstamp: The time stamp of isochronous cycle at which the request arrived.
233+
* @padding: Padding to keep the size of structure as multiples of 8 in various architectures
234+
* since 4 byte alignment is used for 8 byte of object type in System V ABI for i386
235+
* architecture.
234236
* @data: Incoming data, if any
235237
*
236238
* This event is sent when the stack receives an incoming request to an address
@@ -284,10 +286,6 @@ struct fw_cdev_event_request3 {
284286
__u32 handle;
285287
__u32 length;
286288
__u32 tstamp;
287-
/*
288-
* Padding to keep the size of structure as multiples of 8 in various architectures since
289-
* 4 byte alignment is used for 8 byte of object type in System V ABI for i386 architecture.
290-
*/
291289
__u32 padding;
292290
__u32 data[];
293291
};

0 commit comments

Comments
 (0)