diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2012-11-11 10:38:03 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-15 18:34:19 -0500 |
commit | ff8b2f4e424a489222d3c7d55fb2d04c9639ef98 (patch) | |
tree | 856e8e9881145ae6a8ce4a71ae4344928f22f69f /drivers/misc/mei/iorw.c | |
parent | 744f0f2f424d374b233cea5f9b34caa851543755 (diff) |
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, | |||
171 | struct mei_cl_cb *cb; | 171 | struct mei_cl_cb *cb; |
172 | struct mei_client *client; | 172 | struct mei_client *client; |
173 | struct mei_cl *cl; | 173 | struct mei_cl *cl; |
174 | struct mei_cl *cl_pos = NULL; | ||
175 | struct mei_cl *cl_next = NULL; | ||
176 | long timeout = mei_secs_to_jiffies(MEI_CL_CONNECT_TIMEOUT); | 174 | long timeout = mei_secs_to_jiffies(MEI_CL_CONNECT_TIMEOUT); |
177 | int i; | 175 | int i; |
178 | int err; | 176 | int err; |
@@ -229,21 +227,9 @@ int mei_ioctl_connect_client(struct file *file, | |||
229 | goto end; | 227 | goto end; |
230 | } | 228 | } |
231 | clear_bit(cl->host_client_id, dev->host_clients_map); | 229 | clear_bit(cl->host_client_id, dev->host_clients_map); |
232 | list_for_each_entry_safe(cl_pos, cl_next, | 230 | mei_me_cl_unlink(dev, cl); |
233 | &dev->file_list, link) { | ||
234 | if (mei_cl_cmp_id(cl, cl_pos)) { | ||
235 | dev_dbg(&dev->pdev->dev, | ||
236 | "remove file private data node host" | ||
237 | " client = %d, ME client = %d.\n", | ||
238 | cl_pos->host_client_id, | ||
239 | cl_pos->me_client_id); | ||
240 | list_del(&cl_pos->link); | ||
241 | } | ||
242 | 231 | ||
243 | } | ||
244 | dev_dbg(&dev->pdev->dev, "free file private data memory.\n"); | ||
245 | kfree(cl); | 232 | kfree(cl); |
246 | |||
247 | cl = NULL; | 233 | cl = NULL; |
248 | file->private_data = &dev->iamthif_cl; | 234 | file->private_data = &dev->iamthif_cl; |
249 | 235 | ||