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 <tomas.winkler@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/misc/mei/wd.c b/drivers/misc/mei/wd.c
index b836dfffceb5..b1d892cea94d 100644
--- a/drivers/misc/mei/wd.c
+++ b/drivers/misc/mei/wd.c
@@ -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);