diff options
author | Tomas Winkler | 2012-11-11 16:38:03 +0100 |
---|---|---|
committer | Greg Kroah-Hartman | 2012-11-16 00:34:19 +0100 |
commit | ff8b2f4e424a489222d3c7d55fb2d04c9639ef98 (patch) | |
tree | 856e8e9881145ae6a8ce4a71ae4344928f22f69f /drivers/misc/mei/iorw.c | |
parent | mei: extract amthif specific code from mei_poll to mei_amthif_poll (diff) | |
download | kernel-qcow2-linux-ff8b2f4e424a489222d3c7d55fb2d04c9639ef98.tar.gz kernel-qcow2-linux-ff8b2f4e424a489222d3c7d55fb2d04c9639ef98.tar.xz kernel-qcow2-linux-ff8b2f4e424a489222d3c7d55fb2d04c9639ef98.zip |
mei: use link and unlink terms for connecting ME and HOST client
1. rename mei_me_cl_update_filext to mei_me_cl_link
2. rename mei_remove_client_from_file_list to mei_me_cl_unlink
Code style, documenation, and usage of both function is updated
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/iorw.c')
-rw-r--r-- | drivers/misc/mei/iorw.c | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/drivers/misc/mei/iorw.c b/drivers/misc/mei/iorw.c index cf1107658bc0..eb93a1b53b9b 100644 --- a/drivers/misc/mei/iorw.c +++ b/drivers/misc/mei/iorw.c @@ -171,8 +171,6 @@ int mei_ioctl_connect_client(struct file *file, struct mei_cl_cb *cb; struct mei_client *client; struct mei_cl *cl; - struct mei_cl *cl_pos = NULL; - struct mei_cl *cl_next = NULL; long timeout = mei_secs_to_jiffies(MEI_CL_CONNECT_TIMEOUT); int i; int err; @@ -229,21 +227,9 @@ int mei_ioctl_connect_client(struct file *file, goto end; } clear_bit(cl->host_client_id, dev->host_clients_map); - list_for_each_entry_safe(cl_pos, cl_next, - &dev->file_list, link) { - if (mei_cl_cmp_id(cl, cl_pos)) { - dev_dbg(&dev->pdev->dev, - "remove file private data node host" - " client = %d, ME client = %d.\n", - cl_pos->host_client_id, - cl_pos->me_client_id); - list_del(&cl_pos->link); - } + mei_me_cl_unlink(dev, cl); - } - dev_dbg(&dev->pdev->dev, "free file private data memory.\n"); kfree(cl); - cl = NULL; file->private_data = &dev->iamthif_cl; |