s390: convert to msecs_to_jiffies()

Instead of using the old 'jiffies + HZ {/,*} something' calculation
use msecs_to_jiffies() as that makes the code more readable.

Signed-off-by: Sven Schnelle <svens@linux.ibm.com>
Reviewed-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>

diff --git a/arch/s390/kernel/lgr.c b/arch/s390/kernel/lgr.c
index 452502f9a0d986d4f8f97295143146cc26569c30..3b895971c3d05b3c37ea0a06c0d28a9d0c667b4c 100644 (file)
--- a/arch/s390/kernel/lgr.c
+++ b/arch/s390/kernel/lgr.c
@@ -167,7 +167,7 @@ static struct timer_list lgr_timer;
  */
 static void lgr_timer_set(void)
 {
-       mod_timer(&lgr_timer, jiffies + LGR_TIMER_INTERVAL_SECS * HZ);
+       mod_timer(&lgr_timer, jiffies + msecs_to_jiffies(LGR_TIMER_INTERVAL_SECS * MSEC_PER_SEC));
 }
 
 /*

diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index b1113b5194325c483d92aa9b199b9ad086ca3bf5..6bc20861fff98ce914ce2066b18e816c06ee1256 100644 (file)
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -669,7 +669,7 @@ static void stp_work_fn(struct work_struct *work)
                 * There is a usable clock but the synchonization failed.
                 * Retry after a second.
                 */
-               mod_timer(&stp_timer, jiffies + HZ);
+               mod_timer(&stp_timer, jiffies + msecs_to_jiffies(MSEC_PER_SEC));
 
 out_unlock:
        mutex_unlock(&stp_work_mutex);

diff --git a/arch/s390/kernel/topology.c b/arch/s390/kernel/topology.c
index 332b542548cd4e4eb6c5e1030529185b2e778b2e..ca47141a5be9028658eccfd7a9d4e514033e0f0f 100644 (file)
--- a/arch/s390/kernel/topology.c
+++ b/arch/s390/kernel/topology.c
@@ -356,9 +356,9 @@ static atomic_t topology_poll = ATOMIC_INIT(0);
 static void set_topology_timer(void)
 {
        if (atomic_add_unless(&topology_poll, -1, 0))
-               mod_timer(&topology_timer, jiffies + HZ / 10);
+               mod_timer(&topology_timer, jiffies + msecs_to_jiffies(100));
        else
-               mod_timer(&topology_timer, jiffies + HZ * 60);
+               mod_timer(&topology_timer, jiffies + msecs_to_jiffies(60 * MSEC_PER_SEC));
 }
 
 void topology_expect_change(void)

diff --git a/arch/s390/mm/cmm.c b/arch/s390/mm/cmm.c
index 36bce727897bd634b482429082fb2a102cb9e0e6..5c15ae3daf7180503e10fa4a90edaee094423759 100644 (file)
--- a/arch/s390/mm/cmm.c
+++ b/arch/s390/mm/cmm.c
@@ -189,7 +189,7 @@ static void cmm_set_timer(void)
                        del_timer(&cmm_timer);
                return;
        }
-       mod_timer(&cmm_timer, jiffies + cmm_timeout_seconds * HZ);
+       mod_timer(&cmm_timer, jiffies + msecs_to_jiffies(cmm_timeout_seconds * MSEC_PER_SEC));
 }
 
 static void cmm_timer_fn(struct timer_list *unused)