diff options
| author | Tomas Winkler <tomas.winkler@intel.com> | 2014-02-17 13:13:21 (GMT) |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-02-18 18:05:07 (GMT) |
| commit | 64092858acfd995fae0def466126692423c30828 (patch) | |
| tree | 6ec7408d1a8705e170d7aa668901f46b1eb4701b /drivers/misc/mei/amthif.c | |
| parent | 285e2996655b7bbfb5eb83076a7d7e6f03e2f5c2 (diff) | |
| download | linux-64092858acfd995fae0def466126692423c30828.tar.xz | |
mei: wd and amthif use mei_cl_ api for dis/connection
Connect wd and amthif through regular mei_cl_connect API
as there is no reason to connect in asynchronous mode.
Also use mei_cl_is_connected in order to protect flows
instead of depending on wd_pending and amthif_timer
Now we can remove all the special handling in hbm layer
Signed-off-by: Tomas Winkler <tomas.winkler@intel.com>
Signed-off-by: Alexander Usyskin <alexander.usyskin@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/amthif.c')
| -rw-r--r-- | drivers/misc/mei/amthif.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/drivers/misc/mei/amthif.c b/drivers/misc/mei/amthif.c index f88cb26..c0fc23f 100644 --- a/drivers/misc/mei/amthif.c +++ b/drivers/misc/mei/amthif.c @@ -115,14 +115,11 @@ int mei_amthif_host_init(struct mei_device *dev) cl->state = MEI_FILE_CONNECTING; - if (mei_hbm_cl_connect_req(dev, cl)) { - dev_dbg(&dev->pdev->dev, "amthif: Failed to connect to ME client\n"); - cl->state = MEI_FILE_DISCONNECTED; - cl->host_client_id = 0; - } else { - cl->timer_count = MEI_CONNECT_TIMEOUT; - } - return 0; + ret = mei_cl_connect(cl, NULL); + + dev->iamthif_state = MEI_IAMTHIF_IDLE; + + return ret; } /** |