staging: mei: client init code cleanup

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

diff --git a/drivers/staging/mei/wd.c b/drivers/staging/mei/wd.c
index 68c177b..fd67952 100644 (file)
--- 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;
        }