Commit 2ad64ba8 authored by Oren Weil's avatar Oren Weil Committed by Greg Kroah-Hartman
Browse files

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: default avatarOren Weil <oren.jer.weil@intel.com>
Acked-by: default avatarTomas Winkler <tomas.winkler@intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 6d70e935

drivers/staging/mei/wd.c

+15 −22
Original line number Diff line number Diff line
@@ -72,9 +72,8 @@ 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;

	dev->wd_timeout = AMT_WD_DEFAULT_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);
@@ -95,12 +94,6 @@ bool mei_wd_host_init(struct mei_device *dev) 
		ret = false;

		goto end;

	}

	} else {

		dev->wd_bypass = true;

		dev_dbg(&dev->pdev->dev, "WD requested to be disabled\n");

		ret = false;

		goto end;

	}



end:

	return ret;