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>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/misc/mei/interrupt.c b/drivers/misc/mei/interrupt.c
index 5c65bac2fdec..248f581bde31 100644
--- a/drivers/misc/mei/interrupt.c
+++ b/drivers/misc/mei/interrupt.c
@@ -269,7 +269,7 @@ static int _mei_irq_thread_iamthif_read(struct mei_device *dev, s32 *slots)
         dev->iamthif_flow_control_pending = false;
         dev->iamthif_msg_buf_index = 0;
         dev->iamthif_msg_buf_size = 0;
-        dev->iamthif_stall_timer = IAMTHIF_STALL_TIMER;
+        dev->iamthif_stall_timer = MEI_IAMTHIF_STALL_TIMER;
         dev->mei_host_buffer_is_empty = mei_hbuf_is_empty(dev);
         return 0;
 }
@@ -1379,7 +1379,7 @@ void mei_timer(struct work_struct *work)
         if (dev->iamthif_timer) {
 
                 timeout = dev->iamthif_timer +
-                                msecs_to_jiffies(IAMTHIF_READ_TIMER);
+                        mei_secs_to_jiffies(MEI_IAMTHIF_READ_TIMER);
 
                 dev_dbg(&dev->pdev->dev, "dev->iamthif_timer = %ld\n",
                                 dev->iamthif_timer);