mei: move mei_cl_complete to client.c
Subsystems (2)
PATCH 1/2 mei: move mei_cl_complete to client.c
1. rename mei_cl_complete_handler to mei_cl_complete
2. move the function client.c where it belongs
Signed-off-by Tomas Winkler <[email protected]>
--- drivers/misc/mei/client.c | 26 ++++++++++++++++++++++++++ drivers/misc/mei/client.h | 1 + drivers/misc/mei/interrupt.c | 28 +--------------------------- 3 files changed, 28 insertions(+), 27 deletions(-)
drivers/misc/mei/client.c +26 -0
@@ -785,6 +785,32 @@ err: } +/** +* mei_cl_complete - processes completed operation for a client +* +* @cl: private data of the file object. +* @cb: callback block. +*/ +void mei_cl_complete (struct mei_cl *cl,struct mei_cl_cb *cb) +{ +if (cb->fop_type ==MEI_FOP_WRITE ) { +mei_io_cb_free (cb); + cb =NULL ; + cl->writing_state =MEI_WRITE_COMPLETE ; +if (waitqueue_active (&cl->tx_wait)) +wake_up_interruptible (&cl->tx_wait); + + }else if (cb->fop_type ==MEI_FOP_READ && +MEI_READING == cl->reading_state) { + cl->reading_state =MEI_READ_COMPLETE ; +if (waitqueue_active (&cl->rx_wait)) +wake_up_interruptible (&cl->rx_wait); +else +mei_cl_bus_rx_event (cl); + + } +} +/** * mei_cl_all_disconnect - disconnect forcefully all connected clients
drivers/misc/mei/client.h +1 -0
@@ -89,6 +89,7 @@ int mei_cl_disconnect(struct mei_cl *cl);int mei_cl_connect (struct mei_cl *cl,struct file *file);int mei_cl_read_start (struct mei_cl *cl,size_t length);int mei_cl_write (struct mei_cl *cl,struct mei_cl_cb *cb,bool blocking); +void mei_cl_complete (struct mei_cl *cl,struct mei_cl_cb *cb);void mei_host_client_init (struct work_struct *work);
drivers/misc/mei/interrupt.c +1 -27
@@ -31,32 +31,6 @@/** -* mei_cl_complete_handler - processes completed operation for a client -* -* @cl: private data of the file object. -* @cb: callback block. -*/ -static void mei_cl_complete_handler (struct mei_cl *cl,struct mei_cl_cb *cb) -{ -if (cb->fop_type ==MEI_FOP_WRITE ) { -mei_io_cb_free (cb); - cb =NULL ; - cl->writing_state =MEI_WRITE_COMPLETE ; -if (waitqueue_active (&cl->tx_wait)) -wake_up_interruptible (&cl->tx_wait); - - }else if (cb->fop_type ==MEI_FOP_READ && -MEI_READING == cl->reading_state) { - cl->reading_state =MEI_READ_COMPLETE ; -if (waitqueue_active (&cl->rx_wait)) -wake_up_interruptible (&cl->rx_wait); -else -mei_cl_bus_rx_event (cl); - - } -} - -/** * mei_irq_compl_handler - dispatch complete handelers * for the completed callbacks *
@@ -78,7 +52,7 @@ void mei_irq_compl_handler(struct mei_device *dev, struct mei_cl_cb *compl_list)if (cl == &dev->iamthif_cl)mei_amthif_complete (dev, cb);else -mei_cl_complete_handler (cl, cb); +mei_cl_complete (cl, cb); } }EXPORT_SYMBOL_GPL (mei_irq_compl_handler);
Signature · 1 line
1.8.1.2
PATCH 2/2 mei: revamp interrupt thread handlers
1. Use common prefix mei_cl_irq_ and common parameter list for client handlers.
2. Update function kdocs
Signed-off-by Tomas Winkler <[email protected]>
--- drivers/misc/mei/amthif.c | 6 +- drivers/misc/mei/interrupt.c | 130 +++++++++++++++++++++---------------------- drivers/misc/mei/mei_dev.h | 13 +---- 3 files changed, 68 insertions(+), 81 deletions(-)
drivers/misc/mei/amthif.c +3 -3
@@ -443,11 +443,11 @@ unsigned int mei_amthif_poll(struct mei_device *dev,* * returns 0, OK; otherwise, error. */ -int mei_amthif_irq_write_complete (struct mei_device *dev,s32 *slots, -struct mei_cl_cb *cb,struct mei_cl_cb *cmpl_list) +int mei_amthif_irq_write_complete (struct mei_cl *cl,struct mei_cl_cb *cb, +s32 *slots,struct mei_cl_cb *cmpl_list) { +struct mei_device *dev = cl->dev;struct mei_msg_hdr mei_hdr; -struct mei_cl *cl = cb->cl;size_t len = dev->iamthif_msg_buf_size - dev->iamthif_msg_buf_index;u32 msg_slots =mei_data2slots (len);
drivers/misc/mei/interrupt.c +63 -67
275 lines not on this page · raw message
drivers/misc/mei/mei_dev.h +2 -11
@@ -502,8 +502,8 @@ struct mei_cl_cb *mei_amthif_find_read_list_entry(struct mei_device *dev,void mei_amthif_run_next_cmd (struct mei_device *dev); -int mei_amthif_irq_write_complete (struct mei_device *dev,s32 *slots, -struct mei_cl_cb *cb,struct mei_cl_cb *cmpl_list); +int mei_amthif_irq_write_complete (struct mei_cl *cl,struct mei_cl_cb *cb, +s32 *slots,struct mei_cl_cb *cmpl_list);void mei_amthif_complete (struct mei_device *dev,struct mei_cl_cb *cb); int mei_amthif_irq_read_msg(struct mei_device *dev,
@@ -522,15 +522,6 @@ void mei_nfc_host_exit(void);*/ extern const uuid_le mei_nfc_guid; -int mei_amthif_irq_write_complete (struct mei_device *dev,s32 *slots, -struct mei_cl_cb *cb,struct mei_cl_cb *cmpl_list); - -void mei_amthif_complete (struct mei_device *dev,struct mei_cl_cb *cb); -int mei_amthif_irq_read_message (struct mei_cl_cb *complete_list, -struct mei_device *dev,struct mei_msg_hdr *mei_hdr); -int mei_amthif_irq_read (struct mei_device *dev,s32 *slots); - -int mei_wd_send (struct mei_device *dev);int mei_wd_stop (struct mei_device *dev);int mei_wd_host_init (struct mei_device *dev);
Signature · 1 line
1.8.1.2