Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

staging: mei: client init code cleanup

Browse source 
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>
This commit is contained in:
Oren Weil 2011-09-07 09:03:15 +03:00 committed by Greg Kroah-Hartman
parent 6d70e93559
commit 2ad64ba8ea
1 changed files with 13 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/staging/mei/wd.c
View file

@ -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;