summaryrefslogtreecommitdiff
path: root/drivers/misc/mei/wd.c
diff options
context:
space:
mode:
authorTomas Winkler <tomas.winkler@intel.com>2012-11-01 23:17:14 +0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-01 23:31:19 +0400
commit3870c3206b96c900ce29c8068bd5ad46fae71f5b (patch)
treefdf26b80c5b67b758afbe7d1d4814b2f8f56b843 /drivers/misc/mei/wd.c
parentb0d0cf77e72a9d233015f8f21e9dfc9d9b5d0711 (diff)
downloadlinux-3870c3206b96c900ce29c8068bd5ad46fae71f5b.tar.xz
mei: normalize timeouts definitions
1. The hardware book defines timeouts in seconds so we stick to this and define the wrapper function mei_secs_to_jiffies around msecs_to_jiffies to use be used instead multiplying by HZ 2. We add name space prefix MEI_ to all timer defines Signed-off-by: Tomas Winkler <tomas.winkler@intel.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/misc/mei/wd.c')
-rw-r--r--drivers/misc/mei/wd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/mei/wd.c b/drivers/misc/mei/wd.c
index d96c537f046f..8edb054d4b36 100644
--- a/drivers/misc/mei/wd.c
+++ b/drivers/misc/mei/wd.c
@@ -85,7 +85,7 @@ int mei_wd_host_init(struct mei_device *dev)
dev->wd_cl.host_client_id = 0;
return -EIO;
}
- dev->wd_cl.timer_count = CONNECT_TIMEOUT;
+ dev->wd_cl.timer_count = MEI_CONNECT_TIMEOUT;
return 0;
}