s390/time: rename tod clock access functions

Fix name clash with some common code device drivers and add "tod"
to all tod clock access function names.

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

5 files changed, 13 insertions, 13 deletions

diff --git a/drivers/s390/cio/cio.c b/drivers/s390/cio/cio.c
index c8faf6230b0f..986ef6a92a41 100644
--- a/drivers/s390/cio/cio.c
+++ b/drivers/s390/cio/cio.c
@@ -962,9 +962,9 @@ static void css_reset(void)
                         atomic_inc(&chpid_reset_count);
         }
         /* Wait for machine check for all channel paths. */
-        timeout = get_clock() + (RCHP_TIMEOUT << 12);
+        timeout = get_tod_clock() + (RCHP_TIMEOUT << 12);
         while (atomic_read(&chpid_reset_count) != 0) {
-                if (get_clock() > timeout)
+                if (get_tod_clock() > timeout)
                         break;
                 cpu_relax();
         }
diff --git a/drivers/s390/cio/cmf.c b/drivers/s390/cio/cmf.c
index c9fc61c0a866..4495e0627a40 100644
--- a/drivers/s390/cio/cmf.c
+++ b/drivers/s390/cio/cmf.c
@@ -33,7 +33,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/slab.h>
-#include <linux/timex.h>        /* get_clock() */
+#include <linux/timex.h>        /* get_tod_clock() */
 
 #include <asm/ccwdev.h>
 #include <asm/cio.h>
@@ -326,7 +326,7 @@ static int cmf_copy_block(struct ccw_device *cdev)
                 memcpy(cmb_data->last_block, hw_block, cmb_data->size);
                 memcpy(reference_buf, hw_block, cmb_data->size);
         } while (memcmp(cmb_data->last_block, reference_buf, cmb_data->size));
-        cmb_data->last_update = get_clock();
+        cmb_data->last_update = get_tod_clock();
         kfree(reference_buf);
         return 0;
 }
@@ -428,7 +428,7 @@ static void cmf_generic_reset(struct ccw_device *cdev)
                 memset(cmbops->align(cmb_data->hw_block), 0, cmb_data->size);
                 cmb_data->last_update = 0;
         }
-        cdev->private->cmb_start_time = get_clock();
+        cdev->private->cmb_start_time = get_tod_clock();
         spin_unlock_irq(cdev->ccwlock);
 }
 
diff --git a/drivers/s390/cio/css.c b/drivers/s390/cio/css.c
index fd00afd8b850..a239237d43f3 100644
--- a/drivers/s390/cio/css.c
+++ b/drivers/s390/cio/css.c
@@ -780,7 +780,7 @@ static int __init setup_css(int nr)
         css->cssid = nr;
         dev_set_name(&css->device, "css%x", nr);
         css->device.release = channel_subsystem_release;
-        tod_high = (u32) (get_clock() >> 32);
+        tod_high = (u32) (get_tod_clock() >> 32);
         css_generate_pgid(css, tod_high);
         return 0;
 }
diff --git a/drivers/s390/cio/device_fsm.c b/drivers/s390/cio/device_fsm.c
index 1bb1d00095af..c7638c543250 100644
--- a/drivers/s390/cio/device_fsm.c
+++ b/drivers/s390/cio/device_fsm.c
@@ -47,7 +47,7 @@ static void ccw_timeout_log(struct ccw_device *cdev)
         cc = stsch_err(sch->schid, &schib);
 
         printk(KERN_WARNING "cio: ccw device timeout occurred at %llx, "
-               "device information:\n", get_clock());
+               "device information:\n", get_tod_clock());
         printk(KERN_WARNING "cio: orb:\n");
         print_hex_dump(KERN_WARNING, "cio:  ", DUMP_PREFIX_NONE, 16, 1,
                        orb, sizeof(*orb), 0);
diff --git a/drivers/s390/cio/qdio_main.c b/drivers/s390/cio/qdio_main.c
index 1671d3461f29..abc550e5dd35 100644
--- a/drivers/s390/cio/qdio_main.c
+++ b/drivers/s390/cio/qdio_main.c
@@ -338,10 +338,10 @@ again:
                 retries++;
 
                 if (!start_time) {
-                        start_time = get_clock();
+                        start_time = get_tod_clock();
                         goto again;
                 }
-                if ((get_clock() - start_time) < QDIO_BUSY_BIT_PATIENCE)
+                if ((get_tod_clock() - start_time) < QDIO_BUSY_BIT_PATIENCE)
                         goto again;
         }
         if (retries) {
@@ -504,7 +504,7 @@ static int get_inbound_buffer_frontier(struct qdio_q *q)
         int count, stop;
         unsigned char state = 0;
 
-        q->timestamp = get_clock();
+        q->timestamp = get_tod_clock();
 
         /*
          * Don't check 128 buffers, as otherwise qdio_inbound_q_moved
@@ -563,7 +563,7 @@ static int qdio_inbound_q_moved(struct qdio_q *q)
         if (bufnr != q->last_move) {
                 q->last_move = bufnr;
                 if (!is_thinint_irq(q->irq_ptr) && MACHINE_IS_LPAR)
-                        q->u.in.timestamp = get_clock();
+                        q->u.in.timestamp = get_tod_clock();
                 return 1;
         } else
                 return 0;
@@ -595,7 +595,7 @@ static inline int qdio_inbound_q_done(struct qdio_q *q)
          * At this point we know, that inbound first_to_check
          * has (probably) not moved (see qdio_inbound_processing).
          */
-        if (get_clock() > q->u.in.timestamp + QDIO_INPUT_THRESHOLD) {
+        if (get_tod_clock() > q->u.in.timestamp + QDIO_INPUT_THRESHOLD) {
                 DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "in done:%02x",
                               q->first_to_check);
                 return 1;
@@ -772,7 +772,7 @@ static int get_outbound_buffer_frontier(struct qdio_q *q)
         int count, stop;
         unsigned char state = 0;
 
-        q->timestamp = get_clock();
+        q->timestamp = get_tod_clock();
 
         if (need_siga_sync(q))
                 if (((queue_type(q) != QDIO_IQDIO_QFMT) &&