mei: normalize me host client linking routines

In order we can use the same code pattern for in-kernel
and user space host clients we replace mei_cl_link_to_me
with mei_cl_link function.
We then have to keep me client lookupout of the new link function.

The unlinking cannot be yet symetric due to amthif connection
handling

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

1 files changed, 23 insertions, 12 deletions

diff --git a/drivers/misc/mei/wd.c b/drivers/misc/mei/wd.c
index bfcbcc8c028b..77b3820380b0 100644
--- a/drivers/misc/mei/wd.c
+++ b/drivers/misc/mei/wd.c
@@ -64,30 +64,41 @@ static void mei_wd_set_start_timeout(struct mei_device *dev, u16 timeout)
  */
 int mei_wd_host_init(struct mei_device *dev)
 {
-        int id;
-        mei_cl_init(&dev->wd_cl, dev);
+        struct mei_cl *cl = &dev->wd_cl;
+        int i;
+        int ret;
+
+        mei_cl_init(cl, dev);
 
-        /* look for WD client and connect to it */
-        dev->wd_cl.state = MEI_FILE_DISCONNECTED;
         dev->wd_timeout = MEI_WD_DEFAULT_TIMEOUT;
         dev->wd_state = MEI_WD_IDLE;
 
-        /* Connect WD ME client to the host client */
-        id = mei_cl_link_me(&dev->wd_cl,
-                                &mei_wd_guid, MEI_WD_HOST_CLIENT_ID);
 
-        if (id < 0) {
+        /* check for valid client id */
+        i = mei_me_cl_by_uuid(dev, &mei_wd_guid);
+        if (i < 0) {
                 dev_info(&dev->pdev->dev, "wd: failed to find the client\n");
                 return -ENOENT;
         }
 
-        if (mei_hbm_cl_connect_req(dev, &dev->wd_cl)) {
+        cl->me_client_id = dev->me_clients[i].client_id;
+
+        ret = mei_cl_link(cl, MEI_WD_HOST_CLIENT_ID);
+
+        if (ret < 0) {
+                dev_info(&dev->pdev->dev, "wd: failed link client\n");
+                return -ENOENT;
+        }
+
+        cl->state = MEI_FILE_CONNECTING;
+
+        if (mei_hbm_cl_connect_req(dev, cl)) {
                 dev_err(&dev->pdev->dev, "wd: failed to connect to the client\n");
-                dev->wd_cl.state = MEI_FILE_DISCONNECTED;
-                dev->wd_cl.host_client_id = 0;
+                cl->state = MEI_FILE_DISCONNECTED;
+                cl->host_client_id = 0;
                 return -EIO;
         }
-        dev->wd_cl.timer_count = MEI_CONNECT_TIMEOUT;
+        cl->timer_count = MEI_CONNECT_TIMEOUT;
 
         return 0;
 }