mei: drop unneeded client NULL check in cb structure
Subsystems (2)
PATCH 1/2 mei: drop unneeded client NULL check in cb structure
From: Alexander Usyskin <[email protected]>
The pointer to client in the callback structure (cb->cl) can't be NULL with current locking.
We can drop check and warnings as in some cases this just uselessly complicates the code flow.
Signed-off-by Alexander Usyskin <[email protected]>
Signed-off-by Tomas Winkler <[email protected]>
--- drivers/misc/mei/amthif.c | 24 +++++++++--------------- drivers/misc/mei/client.c | 2 +- drivers/misc/mei/hbm.c | 5 ----- drivers/misc/mei/interrupt.c | 12 +----------- 4 files changed, 11 insertions(+), 32 deletions(-)
drivers/misc/mei/amthif.c +9 -15
@@ -360,8 +360,7 @@ int mei_amthif_write(struct mei_device *dev, struct mei_cl_cb *cb)void mei_amthif_run_next_cmd (struct mei_device *dev) {struct mei_cl_cb *cb; -struct mei_cl_cb *next; -int status; +int ret;if (!dev)return ;
@@ -376,16 +375,14 @@ void mei_amthif_run_next_cmd(struct mei_device *dev)dev_dbg (dev->dev,"complete amthif cmd_list cb.\n" ); -list_for_each_entry_safe (cb, next, &dev->amthif_cmd_list.list, list) { -list_del (&cb->list); -if (!cb->cl) -continue ; - status =mei_amthif_send_cmd (dev, cb); -if (status) -dev_warn (dev->dev,"amthif write failed status = %d\n" , - status); -break ; - } + cb =list_first_entry_or_null (&dev->amthif_cmd_list.list, +typeof (*cb), list); +if (!cb) +return ; +list_del (&cb->list); + ret =mei_amthif_send_cmd (dev, cb); +if (ret) +dev_warn (dev->dev,"amthif write failed status = %d\n" , ret); }
@@ -536,9 +533,6 @@ int mei_amthif_irq_read_msg(struct mei_device *dev, cb = dev->iamthif_current_cb; dev->iamthif_current_cb =NULL ; -if (!cb->cl) -return -ENODEV ; - dev->iamthif_stall_timer =0 ; cb->buf_idx = dev->iamthif_msg_buf_index; cb->read_time = jiffies;
drivers/misc/mei/client.c +1 -1
@@ -146,7 +146,7 @@ static void __mei_io_list_flush(struct mei_cl_cb *list,/* enable removing everything if no cl is specified */ list_for_each_entry_safe (cb, next, &list->list, list) { -if (!cl || (cb->cl &&mei_cl_cmp_id (cl, cb->cl))) { +if (!cl ||mei_cl_cmp_id (cl, cb->cl)) {list_del (&cb->list);if (free)mei_io_cb_free (cb);
drivers/misc/mei/hbm.c +0 -5
@@ -637,11 +637,6 @@ static void mei_hbm_cl_res(struct mei_device *dev,list_for_each_entry_safe (cb, next, &dev->ctrl_rd_list.list, list) { cl = cb->cl; -/* this should not happen */ -if (WARN_ON (!cl)) { -list_del_init (&cb->list); -continue ; - }if (cb->fop_type != fop_type)continue ;
drivers/misc/mei/interrupt.c +1 -11
@@ -44,8 +44,6 @@ void mei_irq_compl_handler(struct mei_device *dev, struct mei_cl_cb *compl_list)list_for_each_entry_safe (cb, next, &compl_list->list, list) { cl = cb->cl;list_del (&cb->list); -if (!cl) -continue ;dev_dbg (dev->dev,"completing call back.\n" );if (cl == &dev->iamthif_cl)
@@ -105,7 +103,7 @@ static int mei_cl_irq_read_msg(struct mei_device *dev,list_for_each_entry_safe (cb, next, &dev->read_list.list, list) { cl = cb->cl; -if (!cl || !mei_cl_is_reading (cl, mei_hdr)) +if (!mei_cl_is_reading (cl, mei_hdr))continue ; cl->reading_state =MEI_READING ;
@@ -449,8 +447,6 @@ int mei_irq_write_handler(struct mei_device *dev, struct mei_cl_cb *cmpl_list) list = &dev->write_waiting_list;list_for_each_entry_safe (cb, next, &list->list, list) { cl = cb->cl; -if (cl ==NULL ) -continue ; cl->status =0 ;list_del (&cb->list);
@@ -489,10 +485,6 @@ int mei_irq_write_handler(struct mei_device *dev, struct mei_cl_cb *cmpl_list)dev_dbg (dev->dev,"complete control write list cb.\n" );list_for_each_entry_safe (cb, next, &dev->ctrl_wr_list.list, list) { cl = cb->cl; -if (!cl) { -list_del (&cb->list); -return -ENODEV ; - }switch (cb->fop_type) {case MEI_FOP_DISCONNECT :/* send disconnect message */
@@ -530,8 +522,6 @@ int mei_irq_write_handler(struct mei_device *dev, struct mei_cl_cb *cmpl_list)dev_dbg (dev->dev,"complete write list cb.\n" );list_for_each_entry_safe (cb, next, &dev->write_list.list, list) { cl = cb->cl; -if (cl ==NULL ) -continue ;if (cl == &dev->iamthif_cl) ret =mei_amthif_irq_write (cl, cb, cmpl_list);else
Signature · 1 line
1.9.3
PATCH 2/2 mei: use local cl variables in wd and amthif
Use local cl variable instead of dev->iamthif_cl and dev->wd_cl as the first step to use dynamic allocation of these clients as their are not supported on all platforms
Signed-off-by Tomas Winkler <[email protected]>
--- drivers/misc/mei/amthif.c | 10 ++++++---- drivers/misc/mei/wd.c | 9 ++++++--- 2 files changed, 12 insertions(+), 7 deletions(-)
drivers/misc/mei/amthif.c +6 -4
@@ -262,6 +262,7 @@ out:static int mei_amthif_send_cmd (struct mei_device *dev,struct mei_cl_cb *cb) {struct mei_msg_hdr mei_hdr; +struct mei_cl *cl;int ret;if (!dev || !cb)
@@ -277,8 +278,9 @@ static int mei_amthif_send_cmd(struct mei_device *dev, struct mei_cl_cb *cb) dev->iamthif_msg_buf_size = cb->request_buffer.size;memcpy (dev->iamthif_msg_buf, cb->request_buffer.data, cb->request_buffer.size); + cl = &dev->iamthif_cl; - ret =mei_cl_flow_ctrl_creds (&dev->iamthif_cl); + ret =mei_cl_flow_ctrl_creds (cl);if (ret <0 )return ret;
@@ -292,8 +294,8 @@ static int mei_amthif_send_cmd(struct mei_device *dev, struct mei_cl_cb *cb) mei_hdr.msg_complete =1 ; } - mei_hdr.host_addr = dev->iamthif_cl.host_client_id; - mei_hdr.me_addr = dev->iamthif_cl.me_client_id; + mei_hdr.host_addr = cl->host_client_id; + mei_hdr.me_addr = cl->me_client_id; mei_hdr.reserved =0 ; mei_hdr.internal =0 ; dev->iamthif_msg_buf_index += mei_hdr.length;
@@ -302,7 +304,7 @@ static int mei_amthif_send_cmd(struct mei_device *dev, struct mei_cl_cb *cb)return ret;if (mei_hdr.msg_complete) { -if (mei_cl_flow_ctrl_reduce (&dev->iamthif_cl)) +if (mei_cl_flow_ctrl_reduce (cl))return -EIO ; dev->iamthif_flow_control_pending = true; dev->iamthif_state =MEI_IAMTHIF_FLOW_CONTROL ;
drivers/misc/mei/wd.c +6 -3
@@ -270,15 +270,18 @@ static int mei_wd_ops_stop(struct watchdog_device *wd_dev)static int mei_wd_ops_ping (struct watchdog_device *wd_dev) {struct mei_device *dev; +struct mei_cl *cl;int ret; dev =watchdog_get_drvdata (wd_dev);if (!dev)return -ENODEV ; + cl = &dev->wd_cl; +mutex_lock (&dev->device_lock); -if (dev->wd_cl.state !=MEI_FILE_CONNECTED ) { +if (cl->state !=MEI_FILE_CONNECTED ) {dev_err (dev->dev,"wd: not connected.\n" ); ret = -ENODEV ; goto end;
@@ -286,12 +289,12 @@ static int mei_wd_ops_ping(struct watchdog_device *wd_dev) dev->wd_state =MEI_WD_RUNNING ; - ret =mei_cl_flow_ctrl_creds (&dev->wd_cl); + ret =mei_cl_flow_ctrl_creds (cl);if (ret <0 ) goto end; +/* Check if we can send the ping to HW*/ if (ret &&mei_hbuf_acquire (dev)) { -dev_dbg (dev->dev,"wd: sending ping\n" ); ret =mei_wd_send (dev);
Signature · 1 line
1.9.3