diff options
author | Tomas Winkler <tomas.winkler@intel.com> | 2012-11-01 15:17:14 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-01 15:31:19 -0400 |
commit | 3870c3206b96c900ce29c8068bd5ad46fae71f5b (patch) | |
tree | fdf26b80c5b67b758afbe7d1d4814b2f8f56b843 /drivers/misc/mei/main.c | |
parent | b0d0cf77e72a9d233015f8f21e9dfc9d9b5d0711 (diff) |
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/main.c')
-rw-r--r-- | drivers/misc/mei/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/misc/mei/main.c b/drivers/misc/mei/main.c index 7a03d772fb11..659727a79012 100644 --- a/drivers/misc/mei/main.c +++ b/drivers/misc/mei/main.c | |||
@@ -567,7 +567,7 @@ static ssize_t mei_write(struct file *file, const char __user *ubuf, | |||
567 | 567 | ||
568 | if (write_cb) { | 568 | if (write_cb) { |
569 | timeout = write_cb->read_time + | 569 | timeout = write_cb->read_time + |
570 | msecs_to_jiffies(IAMTHIF_READ_TIMER); | 570 | mei_secs_to_jiffies(MEI_IAMTHIF_READ_TIMER); |
571 | 571 | ||
572 | if (time_after(jiffies, timeout) || | 572 | if (time_after(jiffies, timeout) || |
573 | cl->reading_state == MEI_READ_COMPLETE) { | 573 | cl->reading_state == MEI_READ_COMPLETE) { |