Skip to content

Commit 509405c

Browse files
Lee Jonesbentiss
authored andcommitted
HID: intel-ish-hid: ishtp-fw-loader: Fix a bunch of formatting issues
And demote non-conformant header Fixes the following W=1 kernel build warning(s): drivers/hid/intel-ish-hid/ishtp-fw-loader.c:46: warning: Enum value 'LOADER_CMD_XFER_QUERY' not described in enum 'ish_loader_commands' drivers/hid/intel-ish-hid/ishtp-fw-loader.c:46: warning: Enum value 'LOADER_CMD_XFER_FRAGMENT' not described in enum 'ish_loader_commands' drivers/hid/intel-ish-hid/ishtp-fw-loader.c:46: warning: Enum value 'LOADER_CMD_START' not described in enum 'ish_loader_commands' drivers/hid/intel-ish-hid/ishtp-fw-loader.c:108: warning: Function parameter or member 'reserved' not described in 'loader_msg_hdr' drivers/hid/intel-ish-hid/ishtp-fw-loader.c:196: warning: Function parameter or member 'data' not described in 'response_info' drivers/hid/intel-ish-hid/ishtp-fw-loader.c:196: warning: Function parameter or member 'max_size' not described in 'response_info' drivers/hid/intel-ish-hid/ishtp-fw-loader.c:196: warning: Function parameter or member 'size' not described in 'response_info' drivers/hid/intel-ish-hid/ishtp-fw-loader.c:196: warning: Function parameter or member 'error' not described in 'response_info' drivers/hid/intel-ish-hid/ishtp-fw-loader.c:196: warning: Function parameter or member 'received' not described in 'response_info' drivers/hid/intel-ish-hid/ishtp-fw-loader.c:196: warning: Function parameter or member 'wait_queue' not described in 'response_info' drivers/hid/intel-ish-hid/ishtp-fw-loader.c:233: warning: Function parameter or member 'loader_ishtp_cl' not described in 'ishtp_cl_data' drivers/hid/intel-ish-hid/ishtp-fw-loader.c:233: warning: Function parameter or member 'cl_device' not described in 'ishtp_cl_data' drivers/hid/intel-ish-hid/ishtp-fw-loader.c:233: warning: Function parameter or member 'response' not described in 'ishtp_cl_data' drivers/hid/intel-ish-hid/ishtp-fw-loader.c:233: warning: Function parameter or member 'flag_retry' not described in 'ishtp_cl_data' drivers/hid/intel-ish-hid/ishtp-fw-loader.c:233: warning: Function parameter or member 'retry_count' not described in 'ishtp_cl_data' drivers/hid/intel-ish-hid/ishtp-fw-loader.c:252: warning: Function parameter or member 'client_data' not described in 'get_firmware_variant' drivers/hid/intel-ish-hid/ishtp-fw-loader.c:252: warning: Function parameter or member 'filename' not described in 'get_firmware_variant' drivers/hid/intel-ish-hid/ishtp-fw-loader.c:281: warning: Function parameter or member 'out_msg' not described in 'loader_cl_send' drivers/hid/intel-ish-hid/ishtp-fw-loader.c:281: warning: Function parameter or member 'out_size' not described in 'loader_cl_send' drivers/hid/intel-ish-hid/ishtp-fw-loader.c:281: warning: Function parameter or member 'in_msg' not described in 'loader_cl_send' drivers/hid/intel-ish-hid/ishtp-fw-loader.c:281: warning: Function parameter or member 'in_size' not described in 'loader_cl_send' drivers/hid/intel-ish-hid/ishtp-fw-loader.c:281: warning: expecting prototype for Send message from host to firmware(). Prototype was for loader_cl_send() instead drivers/hid/intel-ish-hid/ishtp-fw-loader.c:445: warning: Function parameter or member 'cl_device' not described in 'loader_cl_event_cb' drivers/hid/intel-ish-hid/ishtp-fw-loader.c:445: warning: Excess function parameter 'device' description in 'loader_cl_event_cb' drivers/hid/intel-ish-hid/ishtp-fw-loader.c:551: warning: expecting prototype for Loads ISH firmware using ishtp interface(). Prototype was for ish_fw_xfer_ishtp() instead drivers/hid/intel-ish-hid/ishtp-fw-loader.c:745: warning: expecting prototype for Start executing ISH main firmware(). Prototype was for ish_fw_start() instead drivers/hid/intel-ish-hid/ishtp-fw-loader.c:767: warning: expecting prototype for Loads ISH firmware from host(). Prototype was for load_fw_from_host() instead Cc: Srinivas Pandruvada <[email protected]> Cc: Jiri Kosina <[email protected]> Cc: Benjamin Tissoires <[email protected]> Cc: Sumit Semwal <[email protected]> Cc: "Christian König" <[email protected]> Cc: Rushikesh S Kadam <[email protected]> Cc: [email protected] Cc: [email protected] Cc: [email protected] Cc: [email protected] Signed-off-by: Lee Jones <[email protected]> Acked-by: Srinivas Pandruvada <[email protected]> Signed-off-by: Benjamin Tissoires <[email protected]>
1 parent fb42b1d commit 509405c

File tree

1 file changed

+23
-22
lines changed

1 file changed

+23
-22
lines changed

drivers/hid/intel-ish-hid/ishtp-fw-loader.c

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -31,13 +31,13 @@
3131

3232
/**
3333
* enum ish_loader_commands - ISH loader host commands.
34-
* LOADER_CMD_XFER_QUERY Query the Shim firmware loader for
34+
* @LOADER_CMD_XFER_QUERY: Query the Shim firmware loader for
3535
* capabilities
36-
* LOADER_CMD_XFER_FRAGMENT Transfer one firmware image fragment at a
36+
* @LOADER_CMD_XFER_FRAGMENT: Transfer one firmware image fragment at a
3737
* time. The command may be executed
3838
* multiple times until the entire firmware
3939
* image is downloaded to SRAM.
40-
* LOADER_CMD_START Start executing the main firmware.
40+
* @LOADER_CMD_START: Start executing the main firmware.
4141
*/
4242
enum ish_loader_commands {
4343
LOADER_CMD_XFER_QUERY = 0,
@@ -95,6 +95,7 @@ static int dma_buf_size_limit = 4 * PAGE_SIZE;
9595
/**
9696
* struct loader_msg_hdr - Header for ISH Loader commands.
9797
* @command: LOADER_CMD* commands. Bit 7 is the response.
98+
* @reserved: Reserved space
9899
* @status: Command response status. Non 0, is error
99100
* condition.
100101
*
@@ -173,16 +174,16 @@ struct loader_start {
173174
* struct response_info - Encapsulate firmware response related
174175
* information for passing between function
175176
* loader_cl_send() and process_recv() callback.
176-
* @data Copy the data received from firmware here.
177-
* @max_size Max size allocated for the @data buffer. If the
177+
* @data: Copy the data received from firmware here.
178+
* @max_size: Max size allocated for the @data buffer. If the
178179
* received data exceeds this value, we log an
179180
* error.
180-
* @size Actual size of data received from firmware.
181-
* @error Returns 0 for success, negative error code for a
181+
* @size: Actual size of data received from firmware.
182+
* @error: Returns 0 for success, negative error code for a
182183
* failure in function process_recv().
183-
* @received Set to true on receiving a valid firmware
184+
* @received: Set to true on receiving a valid firmware
184185
* response to host command
185-
* @wait_queue Wait queue for Host firmware loading where the
186+
* @wait_queue: Wait queue for Host firmware loading where the
186187
* client sends message to ISH firmware and waits
187188
* for response
188189
*/
@@ -195,13 +196,13 @@ struct response_info {
195196
wait_queue_head_t wait_queue;
196197
};
197198

198-
/**
199+
/*
199200
* struct ishtp_cl_data - Encapsulate per ISH-TP Client Data.
200201
* @work_ishtp_reset: Work queue for reset handling.
201202
* @work_fw_load: Work queue for host firmware loading.
202-
* @flag_retry Flag for indicating host firmware loading should
203+
* @flag_retry: Flag for indicating host firmware loading should
203204
* be retried.
204-
* @retry_count Count the number of retries.
205+
* @retry_count: Count the number of retries.
205206
*
206207
* This structure is used to store data per client.
207208
*/
@@ -240,8 +241,8 @@ struct ishtp_cl_data {
240241
/**
241242
* get_firmware_variant() - Gets the filename of firmware image to be
242243
* loaded based on platform variant.
243-
* @client_data Client data instance.
244-
* @filename Returns firmware filename.
244+
* @client_data: Client data instance.
245+
* @filename: Returns firmware filename.
245246
*
246247
* Queries the firmware-name device property string.
247248
*
@@ -266,11 +267,11 @@ static int get_firmware_variant(struct ishtp_cl_data *client_data,
266267
/**
267268
* loader_cl_send() Send message from host to firmware
268269
* @client_data: Client data instance
269-
* @out_msg Message buffer to be sent to firmware
270-
* @out_size Size of out going message
271-
* @in_msg Message buffer where the incoming data copied.
270+
* @out_msg: Message buffer to be sent to firmware
271+
* @out_size: Size of out going message
272+
* @in_msg: Message buffer where the incoming data copied.
272273
* This buffer is allocated by calling
273-
* @in_size Max size of incoming message
274+
* @in_size: Max size of incoming message
274275
*
275276
* Return: Number of bytes copied in the in_msg on success, negative
276277
* error code on failure.
@@ -435,7 +436,7 @@ static void process_recv(struct ishtp_cl *loader_ishtp_cl,
435436

436437
/**
437438
* loader_cl_event_cb() - bus driver callback for incoming message
438-
* @device: Pointer to the ishtp client device for which this
439+
* @cl_device: Pointer to the ishtp client device for which this
439440
* message is targeted
440441
*
441442
* Remove the packet from the list and process the message by calling
@@ -536,7 +537,7 @@ static int ish_query_loader_prop(struct ishtp_cl_data *client_data,
536537
}
537538

538539
/**
539-
* ish_fw_xfer_ishtp() Loads ISH firmware using ishtp interface
540+
* ish_fw_xfer_ishtp() - Loads ISH firmware using ishtp interface
540541
* @client_data: Client data instance
541542
* @fw: Pointer to firmware data struct in host memory
542543
*
@@ -733,7 +734,7 @@ static int ish_fw_xfer_direct_dma(struct ishtp_cl_data *client_data,
733734
}
734735

735736
/**
736-
* ish_fw_start() Start executing ISH main firmware
737+
* ish_fw_start() - Start executing ISH main firmware
737738
* @client_data: client data instance
738739
*
739740
* This function sends message to Shim firmware loader to start
@@ -756,7 +757,7 @@ static int ish_fw_start(struct ishtp_cl_data *client_data)
756757
}
757758

758759
/**
759-
* load_fw_from_host() Loads ISH firmware from host
760+
* load_fw_from_host() - Loads ISH firmware from host
760761
* @client_data: Client data instance
761762
*
762763
* This function loads the ISH firmware to ISH SRAM and starts execution

0 commit comments

Comments
 (0)