Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

mei: fix kernel-doc warnings

Add missed parameters descriptions and return values descriptions

Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Alexander Usyskin and committed by
Greg Kroah-Hartman
ce23139c a8605ea2

+231 -67
+3 -2
drivers/misc/mei/amthif.c
··· 64 64 * 65 65 * @dev: the device structure 66 66 * 67 + * Return: 0 on success, <0 on failure. 67 68 */ 68 69 int mei_amthif_host_init(struct mei_device *dev) 69 70 { ··· 353 352 return mei_amthif_send_cmd(dev, cb); 354 353 } 355 354 /** 356 - * mei_amthif_run_next_cmd 355 + * mei_amthif_run_next_cmd - send next amt command from queue 357 356 * 358 357 * @dev: the device structure 359 358 */ ··· 497 496 } 498 497 499 498 /** 500 - * mei_amthif_irq_read_message - read routine after ISR to 499 + * mei_amthif_irq_read_msg - read routine after ISR to 501 500 * handle the read amthif message 502 501 * 503 502 * @dev: the device structure
+6
drivers/misc/mei/client.c
··· 271 271 * mei_cl_flush_queues - flushes queue lists belonging to cl. 272 272 * 273 273 * @cl: host client 274 + * 275 + * Return: 0 on success, -EINVAL if cl or cl->dev is NULL. 274 276 */ 275 277 int mei_cl_flush_queues(struct mei_cl *cl) 276 278 { ··· 404 402 * mei_cl_unlink - remove me_cl from the list 405 403 * 406 404 * @cl: host client 405 + * 406 + * Return: always 0 407 407 */ 408 408 int mei_cl_unlink(struct mei_cl *cl) 409 409 { ··· 760 756 * mei_cl_read_start - the start read client message function. 761 757 * 762 758 * @cl: host client 759 + * @length: number of bytes to read 763 760 * 764 761 * Return: 0 on success, <0 on failure. 765 762 */ ··· 921 916 * 922 917 * @cl: host client 923 918 * @cb: write callback with filled data 919 + * @blocking: block until completed 924 920 * 925 921 * Return: number of bytes sent on success, <0 on failure. 926 922 */
+2
drivers/misc/mei/debugfs.c
··· 177 177 * 178 178 * @dev: the mei device structure 179 179 * @name: the mei device name 180 + * 181 + * Return: 0 on success, <0 on failure. 180 182 */ 181 183 int mei_dbgfs_register(struct mei_device *dev, const char *name) 182 184 {
+2
drivers/misc/mei/hbm.c
··· 176 176 * @cl: client 177 177 * @hbm_cmd: host bus message command 178 178 * @len: buffer length 179 + * 180 + * Return: 0 on success, <0 on failure. 179 181 */ 180 182 static inline 181 183 int mei_hbm_cl_write(struct mei_device *dev,
+34 -7
drivers/misc/mei/hw-me.c
··· 94 94 * and ignores the H_IS bit for it is write-one-to-zero. 95 95 * 96 96 * @hw: the me hardware structure 97 + * @hcsr: new register value 97 98 */ 98 99 static inline void mei_hcsr_set(struct mei_me_hw *hw, u32 hcsr) 99 100 { ··· 107 106 * 108 107 * @dev: mei device 109 108 * @fw_status: fw status register values 109 + * 110 + * Return: 0 on success, error otherwise 110 111 */ 111 112 static int mei_me_fw_status(struct mei_device *dev, 112 113 struct mei_fw_status *fw_status) ··· 152 149 * mei_me_pg_state - translate internal pg state 153 150 * to the mei power gating state 154 151 * 155 - * @hw - me hardware 156 - * returns: MEI_PG_OFF if aliveness is on and MEI_PG_ON otherwise 152 + * @dev: mei device 153 + * 154 + * Return: MEI_PG_OFF if aliveness is on and MEI_PG_ON otherwise 157 155 */ 158 156 static inline enum mei_pg_state mei_me_pg_state(struct mei_device *dev) 159 157 { ··· 164 160 } 165 161 166 162 /** 167 - * mei_clear_interrupts - clear and stop interrupts 163 + * mei_me_intr_clear - clear and stop interrupts 168 164 * 169 165 * @dev: the device structure 170 166 */ ··· 191 187 } 192 188 193 189 /** 194 - * mei_disable_interrupts - disables mei device interrupts 190 + * mei_me_intr_disable - disables mei device interrupts 195 191 * 196 192 * @dev: the device structure 197 193 */ ··· 226 222 * 227 223 * @dev: the device structure 228 224 * @intr_enable: if interrupt should be enabled after reset. 225 + * 226 + * Return: always 0 229 227 */ 230 228 static int mei_me_hw_reset(struct mei_device *dev, bool intr_enable) 231 229 { ··· 265 259 /** 266 260 * mei_me_host_set_ready - enable device 267 261 * 268 - * @dev - mei device 269 - * returns bool 262 + * @dev: mei device 270 263 */ 271 - 272 264 static void mei_me_host_set_ready(struct mei_device *dev) 273 265 { 274 266 struct mei_me_hw *hw = to_me_hw(dev); ··· 275 271 hw->host_hw_state |= H_IE | H_IG | H_RDY; 276 272 mei_hcsr_set(hw, hw->host_hw_state); 277 273 } 274 + 278 275 /** 279 276 * mei_me_host_is_ready - check whether the host has turned ready 280 277 * ··· 304 299 return (hw->me_hw_state & ME_RDY_HRA) == ME_RDY_HRA; 305 300 } 306 301 302 + /** 303 + * mei_me_hw_ready_wait - wait until the me(hw) has turned ready 304 + * or timeout is reached 305 + * 306 + * @dev: mei device 307 + * Return: 0 on success, error otherwise 308 + */ 307 309 static int mei_me_hw_ready_wait(struct mei_device *dev) 308 310 { 309 311 mutex_unlock(&dev->device_lock); ··· 327 315 return 0; 328 316 } 329 317 318 + /** 319 + * mei_me_hw_start - hw start routine 320 + * 321 + * @dev: mei device 322 + * Return: 0 on success, error otherwise 323 + */ 330 324 static int mei_me_hw_start(struct mei_device *dev) 331 325 { 332 326 int ret = mei_me_hw_ready_wait(dev); ··· 399 381 return empty_slots; 400 382 } 401 383 384 + /** 385 + * mei_me_hbuf_max_len - returns size of hw buffer. 386 + * 387 + * @dev: the device structure 388 + * 389 + * Return: size of hw buffer in bytes 390 + */ 402 391 static size_t mei_me_hbuf_max_len(const struct mei_device *dev) 403 392 { 404 393 return dev->hbuf_depth * sizeof(u32) - sizeof(struct mei_msg_hdr); ··· 497 472 * @dev: the device structure 498 473 * @buffer: message buffer will be written 499 474 * @buffer_length: message size will be read 475 + * 476 + * Return: always 0 500 477 */ 501 478 static int mei_me_read_slots(struct mei_device *dev, unsigned char *buffer, 502 479 unsigned long buffer_length)
+6
drivers/misc/mei/hw-me.h
··· 47 47 #define MEI_ME_RPM_TIMEOUT 500 /* ms */ 48 48 49 49 /** 50 + * struct mei_me_hw - me hw specific data 51 + * 50 52 * @cfg: per device generation config and ops 53 + * @mem_addr: io memory address 54 + * @host_hw_state: cached host state 55 + * @me_hw_state: cached me (fw) state 56 + * @pg_state: power gating state 51 57 */ 52 58 struct mei_me_hw { 53 59 const struct mei_cfg *cfg;
+45 -18
drivers/misc/mei/hw-txe.c
··· 28 28 #include "hbm.h" 29 29 30 30 /** 31 - * mei_txe_reg_read - Reads 32bit data from the device 31 + * mei_txe_reg_read - Reads 32bit data from the txe device 32 32 * 33 33 * @base_addr: registers base address 34 34 * @offset: register offset 35 35 * 36 + * Return: register value 36 37 */ 37 38 static inline u32 mei_txe_reg_read(void __iomem *base_addr, 38 39 unsigned long offset) ··· 42 41 } 43 42 44 43 /** 45 - * mei_txe_reg_write - Writes 32bit data to the device 44 + * mei_txe_reg_write - Writes 32bit data to the txe device 46 45 * 47 46 * @base_addr: registers base address 48 47 * @offset: register offset ··· 57 56 /** 58 57 * mei_txe_sec_reg_read_silent - Reads 32bit data from the SeC BAR 59 58 * 60 - * @dev: the device structure 59 + * @hw: the txe hardware structure 61 60 * @offset: register offset 62 61 * 63 62 * Doesn't check for aliveness while Reads 32bit data from the SeC BAR 63 + * 64 + * Return: register value 64 65 */ 65 66 static inline u32 mei_txe_sec_reg_read_silent(struct mei_txe_hw *hw, 66 67 unsigned long offset) ··· 73 70 /** 74 71 * mei_txe_sec_reg_read - Reads 32bit data from the SeC BAR 75 72 * 76 - * @dev: the device structure 73 + * @hw: the txe hardware structure 77 74 * @offset: register offset 78 75 * 79 76 * Reads 32bit data from the SeC BAR and shout loud if aliveness is not set 77 + * 78 + * Return: register value 80 79 */ 81 80 static inline u32 mei_txe_sec_reg_read(struct mei_txe_hw *hw, 82 81 unsigned long offset) ··· 120 115 /** 121 116 * mei_txe_br_reg_read - Reads 32bit data from the Bridge BAR 122 117 * 123 - * @hw: the device structure 118 + * @hw: the txe hardware structure 124 119 * @offset: offset from which to read the data 125 120 * 121 + * Return: the byte read. 126 122 */ 127 123 static inline u32 mei_txe_br_reg_read(struct mei_txe_hw *hw, 128 124 unsigned long offset) ··· 153 147 * Request for aliveness change and returns true if the change is 154 148 * really needed and false if aliveness is already 155 149 * in the requested state 156 - * Requires device lock to be held 150 + * 151 + * Locking: called under "dev->device_lock" lock 152 + * 153 + * Return: true if request was send 157 154 */ 158 155 static bool mei_txe_aliveness_set(struct mei_device *dev, u32 req) 159 156 { ··· 181 172 * 182 173 * Extract HICR_HOST_ALIVENESS_RESP_ACK bit from 183 174 * from HICR_HOST_ALIVENESS_REQ register value 175 + * 176 + * Return: SICR_HOST_ALIVENESS_REQ_REQUESTED bit value 184 177 */ 185 178 static u32 mei_txe_aliveness_req_get(struct mei_device *dev) 186 179 { ··· 195 184 196 185 /** 197 186 * mei_txe_aliveness_get - get aliveness response register value 187 + * 198 188 * @dev: the device structure 199 189 * 200 - * Extract HICR_HOST_ALIVENESS_RESP_ACK bit 201 - * from HICR_HOST_ALIVENESS_RESP register value 190 + * Return: HICR_HOST_ALIVENESS_RESP_ACK bit from HICR_HOST_ALIVENESS_RESP 191 + * register 202 192 */ 203 193 static u32 mei_txe_aliveness_get(struct mei_device *dev) 204 194 { ··· 290 278 * mei_txe_aliveness_set_sync - sets an wait for aliveness to complete 291 279 * 292 280 * @dev: the device structure 281 + * @req: requested aliveness value 293 282 * 294 283 * Return: 0 on success and < 0 otherwise 295 284 */ ··· 372 359 * mei_txe_is_input_ready - check if TXE is ready for receiving data 373 360 * 374 361 * @dev: the device structure 362 + * 363 + * Return: true if INPUT STATUS READY bit is set 375 364 */ 376 365 static bool mei_txe_is_input_ready(struct mei_device *dev) 377 366 { ··· 432 417 * 433 418 * Checks if there are pending interrupts 434 419 * only Aliveness, Readiness, Input ready, and Output doorbell are relevant 420 + * 421 + * Return: true if there are pending interrupts 435 422 */ 436 423 static bool mei_txe_pending_interrupts(struct mei_device *dev) 437 424 { ··· 493 476 /* Readiness */ 494 477 495 478 /** 496 - * mei_txe_readiness_set_host_rdy 479 + * mei_txe_readiness_set_host_rdy - set host readiness bit 497 480 * 498 481 * @dev: the device structure 499 482 */ ··· 507 490 } 508 491 509 492 /** 510 - * mei_txe_readiness_clear 493 + * mei_txe_readiness_clear - clear host readiness bit 511 494 * 512 495 * @dev: the device structure 513 496 */ ··· 538 521 * mei_txe_readiness_is_sec_rdy - check readiness 539 522 * for HICR_SEC_IPC_READINESS_SEC_RDY 540 523 * 541 - * @readiness - cached readiness state 524 + * @readiness: cached readiness state 525 + * 526 + * Return: true if readiness bit is set 542 527 */ 543 528 static inline bool mei_txe_readiness_is_sec_rdy(u32 readiness) 544 529 { ··· 551 532 * mei_txe_hw_is_ready - check if the hw is ready 552 533 * 553 534 * @dev: the device structure 535 + * 536 + * Return: true if sec is ready 554 537 */ 555 538 static bool mei_txe_hw_is_ready(struct mei_device *dev) 556 539 { ··· 565 544 * mei_txe_host_is_ready - check if the host is ready 566 545 * 567 546 * @dev: the device structure 547 + * 548 + * Return: true if host is ready 568 549 */ 569 550 static inline bool mei_txe_host_is_ready(struct mei_device *dev) 570 551 { ··· 612 589 * 613 590 * @dev: mei device 614 591 * @fw_status: fw status register values 592 + * 593 + * Return: 0 on success, error otherwise 615 594 */ 616 595 static int mei_txe_fw_status(struct mei_device *dev, 617 596 struct mei_fw_status *fw_status) ··· 668 643 * @header: header of message 669 644 * @buf: message buffer will be written 670 645 * 671 - * Return: if success, 0 - otherwise. 646 + * Return: 0 if success, <0 - otherwise. 672 647 */ 673 648 674 649 static int mei_txe_write(struct mei_device *dev, ··· 735 710 * 736 711 * @dev: the device structure 737 712 * 738 - * Return: PAYLOAD_SIZE - 4 713 + * Return: the PAYLOAD_SIZE - 4 739 714 */ 740 715 static size_t mei_txe_hbuf_max_len(const struct mei_device *dev) 741 716 { ··· 884 859 * 885 860 * @dev: the device structure 886 861 * 887 - * Return: 0 on success and < 0 in case of error 862 + * Return: 0 on success an error code otherwise 888 863 */ 889 864 static int mei_txe_hw_start(struct mei_device *dev) 890 865 { ··· 940 915 * 941 916 * @dev: the device structure 942 917 * @do_ack: acknowledge interrupts 918 + * 919 + * Return: true if found interrupts to process. 943 920 */ 944 921 static bool mei_txe_check_and_ack_intrs(struct mei_device *dev, bool do_ack) 945 922 { ··· 1017 990 * @dev_id: pointer to the device structure 1018 991 * 1019 992 * Return: IRQ_HANDLED 1020 - * 1021 993 */ 1022 994 irqreturn_t mei_txe_irq_thread_handler(int irq, void *dev_id) 1023 995 { ··· 1161 1135 /** 1162 1136 * mei_txe_dev_init - allocates and initializes txe hardware specific structure 1163 1137 * 1164 - * @pdev - pci device 1138 + * @pdev: pci device 1165 1139 * 1166 - * Return: struct mei_device * on success or NULL; 1167 - * 1140 + * Return: struct mei_device * on success or NULL 1168 1141 */ 1169 1142 struct mei_device *mei_txe_dev_init(struct pci_dev *pdev) 1170 1143 { ··· 1190 1165 * @dev: the device structure 1191 1166 * @addr: physical address start of the range 1192 1167 * @range: physical range size 1168 + * 1169 + * Return: 0 on success an error code otherwise 1193 1170 */ 1194 1171 int mei_txe_setup_satt2(struct mei_device *dev, phys_addr_t addr, u32 range) 1195 1172 {
+1
drivers/misc/mei/hw-txe.h
··· 40 40 * @mem_addr: SeC and BRIDGE bars 41 41 * @aliveness: aliveness (power gating) state of the hardware 42 42 * @readiness: readiness state of the hardware 43 + * @slots: number of empty slots 43 44 * @wait_aliveness_resp: aliveness wait queue 44 45 * @intr_cause: translated interrupt cause 45 46 */
+2
drivers/misc/mei/hw.h
··· 109 109 * @MEI_HBMS_NOT_ALLOWED : operation not allowed 110 110 * @MEI_HBMS_ALREADY_STARTED : system is already started 111 111 * @MEI_HBMS_NOT_STARTED : system not started 112 + * 113 + * @MEI_HBMS_MAX : sentinel 112 114 */ 113 115 enum mei_hbm_status { 114 116 MEI_HBMS_SUCCESS = 0,
+2 -2
drivers/misc/mei/init.c
··· 59 59 * mei_cancel_work - Cancel mei background jobs 60 60 * 61 61 * @dev: the device structure 62 - * 63 - * Return: 0 on success or < 0 if the reset hasn't succeeded 64 62 */ 65 63 void mei_cancel_work(struct mei_device *dev) 66 64 { ··· 73 75 * mei_reset - resets host and fw. 74 76 * 75 77 * @dev: the device structure 78 + * 79 + * Return: 0 on success or < 0 if the reset hasn't succeeded 76 80 */ 77 81 int mei_reset(struct mei_device *dev) 78 82 {
+2 -2
drivers/misc/mei/interrupt.c
··· 87 87 } 88 88 89 89 /** 90 - * mei_irq_read_client_message - process client message 90 + * mei_cl_irq_read_msg - process client message 91 91 * 92 92 * @dev: the device structure 93 93 * @mei_hdr: header of mei client message ··· 234 234 235 235 236 236 /** 237 - * mei_cl_irq_close - processes client read related operation from the 237 + * mei_cl_irq_read - processes client read related operation from the 238 238 * interrupt thread context - request for flow control credits 239 239 * 240 240 * @cl: client
+118 -33
drivers/misc/mei/mei_dev.h
··· 129 129 130 130 /** 131 131 * enum mei_cb_file_ops - file operation associated with the callback 132 - * @MEI_FOP_READ - read 133 - * @MEI_FOP_WRITE - write 134 - * @MEI_FOP_CONNECT - connect 135 - * @MEI_FOP_DISCONNECT - disconnect 136 - * @MEI_FOP_DISCONNECT_RSP - disconnect response 132 + * @MEI_FOP_READ: read 133 + * @MEI_FOP_WRITE: write 134 + * @MEI_FOP_CONNECT: connect 135 + * @MEI_FOP_DISCONNECT: disconnect 136 + * @MEI_FOP_DISCONNECT_RSP: disconnect response 137 137 */ 138 138 enum mei_cb_file_ops { 139 139 MEI_FOP_READ = 0, ··· 189 189 * @list: link in callback queue 190 190 * @cl: file client who is running this operation 191 191 * @fop_type: file operation type 192 + * @request_buffer: buffer to store request data 193 + * @response_buffer: buffer to store response data 194 + * @buf_idx: last read index 195 + * @read_time: last read operation time stamp (iamthif) 196 + * @file_object: pointer to file structure 197 + * @internal: communication between driver and FW flag 192 198 */ 193 199 struct mei_cl_cb { 194 200 struct list_head list; ··· 208 202 u32 internal:1; 209 203 }; 210 204 211 - /* MEI client instance carried as file->private_data*/ 205 + /** 206 + * struct mei_cl - me client host representation 207 + * carried in file->private_data 208 + * 209 + * @link: link in the clients list 210 + * @dev: mei parent device 211 + * @state: file operation state 212 + * @tx_wait: wait queue for tx completion 213 + * @rx_wait: wait queue for rx completion 214 + * @wait: wait queue for management operation 215 + * @status: connection status 216 + * @cl_uuid: client uuid name 217 + * @host_client_id: host id 218 + * @me_client_id: me/fw id 219 + * @mei_flow_ctrl_creds: transmit flow credentials 220 + * @timer_count: watchdog timer for operation completion 221 + * @reading_state: state of the rx 222 + * @writing_state: state of the tx 223 + * @read_cb: current pending reading callback 224 + * 225 + * @device: device on the mei client bus 226 + * @device_link: link to bus clients 227 + */ 212 228 struct mei_cl { 213 229 struct list_head link; 214 230 struct mei_device *dev; ··· 239 211 wait_queue_head_t rx_wait; 240 212 wait_queue_head_t wait; 241 213 int status; 242 - /* ID of client connected */ 243 214 uuid_le cl_uuid; 244 215 u8 host_client_id; 245 216 u8 me_client_id; ··· 361 334 * @dev: linux driver model device pointer 362 335 * @cl: mei client 363 336 * @ops: ME transport ops 337 + * @event_work: async work to execute event callback 364 338 * @event_cb: Drivers register this callback to get asynchronous ME 365 339 * events (e.g. Rx buffer pending) notifications. 340 + * @event_context: event callback run context 366 341 * @events: Events bitmask sent to the driver. 367 342 * @priv_data: client private data 368 343 */ ··· 384 355 }; 385 356 386 357 387 - /** 358 + /** 388 359 * enum mei_pg_event - power gating transition events 389 360 * 390 361 * @MEI_PG_EVENT_IDLE: the driver is not in power gating transition ··· 412 383 413 384 /** 414 385 * struct mei_device - MEI private device struct 415 - 386 + * 416 387 * @dev : device on a bus 417 388 * @cdev : character device 418 389 * @minor : minor number allocated for device 419 390 * 420 - * @reset_count : limits the number of consecutive resets 421 - * @hbm_state : state of host bus message protocol 391 + * @read_list : read completion list 392 + * @write_list : write pending list 393 + * @write_waiting_list : write completion list 394 + * @ctrl_wr_list : pending control write list 395 + * @ctrl_rd_list : pending control read list 422 396 * 423 - * @hbm_f_pg_supported : hbm feature pgi protocol 397 + * @file_list : list of opened handles 398 + * @open_handle_count: number of opened handles 399 + * 400 + * @device_lock : big device lock 401 + * @timer_work : MEI timer delayed work (timeouts) 402 + * 403 + * @recvd_hw_ready : hw ready message received flag 404 + * 405 + * @wait_hw_ready : wait queue for receive HW ready message form FW 406 + * @wait_pg : wait queue for receive PG message from FW 407 + * @wait_hbm_start : wait queue for receive HBM start message from FW 408 + * @wait_stop_wd : wait queue for receive WD stop message from FW 409 + * 410 + * @reset_count : number of consecutive resets 411 + * @dev_state : device state 412 + * @hbm_state : state of host bus message protocol 413 + * @init_clients_timer : HBM init handshake timeout 424 414 * 425 415 * @pg_event : power gating event 426 - * @mem_addr : mem mapped base register address 427 - 416 + * @pg_domain : runtime PM domain 417 + * 418 + * @rd_msg_buf : control messages buffer 419 + * @rd_msg_hdr : read message header storage 420 + * 428 421 * @hbuf_depth : depth of hardware host/write buffer is slots 429 422 * @hbuf_is_ready : query if the host host/write buffer is ready 430 423 * @wr_msg : the buffer for hbm control messages 424 + * 425 + * @version : HBM protocol version in use 426 + * @hbm_f_pg_supported : hbm feature pgi protocol 427 + * 428 + * @me_clients : list of FW clients 429 + * @me_clients_map : FW clients bit map 430 + * @host_clients_map : host clients id pool 431 + * @me_client_index : last FW client index in enumeration 432 + * 433 + * @wd_cl : watchdog client 434 + * @wd_state : watchdog client state 435 + * @wd_pending : watchdog command is pending 436 + * @wd_timeout : watchdog expiration timeout 437 + * @wd_data : watchdog message buffer 438 + * 439 + * @amthif_cmd_list : amthif list for cmd waiting 440 + * @amthif_rd_complete_list : amthif list for reading completed cmd data 441 + * @iamthif_file_object : file for current amthif operation 442 + * @iamthif_cl : amthif host client 443 + * @iamthif_current_cb : amthif current operation callback 444 + * @iamthif_open_count : number of opened amthif connections 445 + * @iamthif_mtu : amthif client max message length 446 + * @iamthif_timer : time stamp of current amthif command completion 447 + * @iamthif_stall_timer : timer to detect amthif hang 448 + * @iamthif_msg_buf : amthif current message buffer 449 + * @iamthif_msg_buf_size : size of current amthif message request buffer 450 + * @iamthif_msg_buf_index : current index in amthif message request buffer 451 + * @iamthif_state : amthif processor state 452 + * @iamthif_flow_control_pending: amthif waits for flow control 453 + * @iamthif_ioctl : wait for completion if amthif control message 454 + * @iamthif_canceled : current amthif command is canceled 455 + * 456 + * @init_work : work item for the device init 457 + * @reset_work : work item for the device reset 458 + * 459 + * @device_list : mei client bus list 460 + * 461 + * @dbgfs_dir : debugfs mei root directory 462 + * 463 + * @ops: : hw specific operations 464 + * @hw : hw specific data 431 465 */ 432 466 struct mei_device { 433 467 struct device *dev; 434 468 struct cdev cdev; 435 469 int minor; 436 470 437 - /* 438 - * lists of queues 439 - */ 440 - /* array of pointers to aio lists */ 441 - struct mei_cl_cb read_list; /* driver read queue */ 442 - struct mei_cl_cb write_list; /* driver write queue */ 443 - struct mei_cl_cb write_waiting_list; /* write waiting queue */ 444 - struct mei_cl_cb ctrl_wr_list; /* managed write IOCTL list */ 445 - struct mei_cl_cb ctrl_rd_list; /* managed read IOCTL list */ 471 + struct mei_cl_cb read_list; 472 + struct mei_cl_cb write_list; 473 + struct mei_cl_cb write_waiting_list; 474 + struct mei_cl_cb ctrl_wr_list; 475 + struct mei_cl_cb ctrl_rd_list; 446 476 447 - /* 448 - * list of files 449 - */ 450 477 struct list_head file_list; 451 478 long open_handle_count; 452 479 453 - /* 454 - * lock for the device 455 - */ 456 - struct mutex device_lock; /* device lock */ 457 - struct delayed_work timer_work; /* MEI timer delayed work (timeouts) */ 480 + struct mutex device_lock; 481 + struct delayed_work timer_work; 458 482 459 483 bool recvd_hw_ready; 460 484 /* ··· 534 452 struct dev_pm_domain pg_domain; 535 453 #endif /* CONFIG_PM_RUNTIME */ 536 454 537 - unsigned char rd_msg_buf[MEI_RD_MSG_BUF_SIZE]; /* control messages */ 455 + unsigned char rd_msg_buf[MEI_RD_MSG_BUF_SIZE]; 538 456 u32 rd_msg_hdr; 539 457 540 458 /* write buffer */ ··· 604 522 /** 605 523 * mei_data2slots - get slots - number of (dwords) from a message length 606 524 * + size of the mei header 525 + * 607 526 * @length: size of the messages in bytes 608 527 * 609 528 * Return: number of slots ··· 615 532 } 616 533 617 534 /** 618 - * mei_slots2data- get data in slots - bytes from slots 535 + * mei_slots2data - get data in slots - bytes from slots 536 + * 619 537 * @slots: number of available slots 538 + * 620 539 * Return: number of bytes in slots 621 540 */ 622 541 static inline u32 mei_slots2data(int slots)
+5
drivers/misc/mei/nfc.c
··· 94 94 * @cl: NFC host client 95 95 * @cl_info: NFC info host client 96 96 * @init_work: perform connection to the info client 97 + * @send_wq: send completion wait queue 97 98 * @fw_ivn: NFC Interface Version Number 98 99 * @vendor_id: NFC manufacturer ID 99 100 * @radio_type: NFC radio type 101 + * @bus_name: bus name 102 + * 103 + * @req_id: message counter 104 + * @recv_req_id: reception message counter 100 105 */ 101 106 struct mei_nfc_dev { 102 107 struct mei_cl *cl;
+3 -3
drivers/misc/mei/pci-me.c
··· 98 98 #endif /* CONFIG_PM_RUNTIME */ 99 99 100 100 /** 101 - * mei_quirk_probe - probe for devices that doesn't valid ME interface 101 + * mei_me_quirk_probe - probe for devices that doesn't valid ME interface 102 102 * 103 103 * @pdev: PCI device structure 104 104 * @cfg: per generation config ··· 117 117 } 118 118 119 119 /** 120 - * mei_probe - Device Initialization Routine 120 + * mei_me_probe - Device Initialization Routine 121 121 * 122 122 * @pdev: PCI device structure 123 123 * @ent: entry in kcs_pci_tbl ··· 249 249 } 250 250 251 251 /** 252 - * mei_remove - Device Removal Routine 252 + * mei_me_remove - Device Removal Routine 253 253 * 254 254 * @pdev: PCI device structure 255 255 *