lkml.org 
[lkml]   [2011]   [Sep]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 09/12 v2] stagign: mei: client init code cleanup
    Date
    starting removing the dependency from the module parameters.
    setting the default timeout on init so don't need to check if it is bigger
    then zero.

    Signed-off-by: Oren Weil <oren.jer.weil@intel.com>
    Acked-by: Tomas Winkler <tomas.winkler@intel.com>
    ---
    drivers/staging/mei/wd.c | 33 +++++++++++++--------------------
    1 files changed, 13 insertions(+), 20 deletions(-)

    diff --git a/drivers/staging/mei/wd.c b/drivers/staging/mei/wd.c
    index 68c177b..fd67952 100644
    --- a/drivers/staging/mei/wd.c
    +++ b/drivers/staging/mei/wd.c
    @@ -72,32 +72,25 @@ bool mei_wd_host_init(struct mei_device *dev)

    /* look for WD client and connect to it */
    dev->wd_cl.state = MEI_FILE_DISCONNECTED;
    - dev->wd_timeout = watchdog_timeout;
    -
    - if (dev->wd_timeout > 0) {
    - /* find ME WD client */
    - mei_find_me_client_update_filext(dev, &dev->wd_cl,
    - &mei_wd_guid, MEI_WD_HOST_CLIENT_ID);
    -
    - dev_dbg(&dev->pdev->dev, "check wd_cl\n");
    - if (MEI_FILE_CONNECTING == dev->wd_cl.state) {
    - if (!mei_connect(dev, &dev->wd_cl)) {
    - dev_dbg(&dev->pdev->dev, "Failed to connect to WD client\n");
    - dev->wd_cl.state = MEI_FILE_DISCONNECTED;
    - dev->wd_cl.host_client_id = 0;
    - ret = false;
    - goto end;
    - } else {
    - dev->wd_cl.timer_count = CONNECT_TIMEOUT;
    - }
    - } else {
    - dev_dbg(&dev->pdev->dev, "Failed to find WD client\n");
    + dev->wd_timeout = AMT_WD_DEFAULT_TIMEOUT;
    +
    + /* find ME WD client */
    + mei_find_me_client_update_filext(dev, &dev->wd_cl,
    + &mei_wd_guid, MEI_WD_HOST_CLIENT_ID);
    +
    + dev_dbg(&dev->pdev->dev, "check wd_cl\n");
    + if (MEI_FILE_CONNECTING == dev->wd_cl.state) {
    + if (!mei_connect(dev, &dev->wd_cl)) {
    + dev_dbg(&dev->pdev->dev, "Failed to connect to WD client\n");
    + dev->wd_cl.state = MEI_FILE_DISCONNECTED;
    + dev->wd_cl.host_client_id = 0;
    ret = false;
    goto end;
    + } else {
    + dev->wd_cl.timer_count = CONNECT_TIMEOUT;
    }
    } else {
    - dev->wd_bypass = true;
    - dev_dbg(&dev->pdev->dev, "WD requested to be disabled\n");
    + dev_dbg(&dev->pdev->dev, "Failed to find WD client\n");
    ret = false;
    goto end;
    }
    --
    1.7.4.1


    \
     
     \ /
      Last update: 2011-09-07 08:07    [W:0.022 / U:90.072 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site