diff options
| author |   Tomas Winkler <tomas.winkler@intel.com> | 2012-11-01 21:17:14 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-01 12:31:19 -0700 |
| commit | 3870c3206b96c900ce29c8068bd5ad46fae71f5b (patch) | |
| tree | fdf26b80c5b67b758afbe7d1d4814b2f8f56b843 /drivers/misc/mei/main.c | |
| parent | mei: mei_write: revamp function flow (diff) | |
| download | linux-dev-3870c3206b96c900ce29c8068bd5ad46fae71f5b.tar.xz linux-dev-3870c3206b96c900ce29c8068bd5ad46fae71f5b.zip | |
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, if (write_cb) { timeout = write_cb->read_time + - msecs_to_jiffies(IAMTHIF_READ_TIMER); + mei_secs_to_jiffies(MEI_IAMTHIF_READ_TIMER); if (time_after(jiffies, timeout) || cl->reading_state == MEI_READ_COMPLETE) { |