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>

8 files changed, 39 insertions, 39 deletions

diff --git a/drivers/s390/block/dasd.c b/drivers/s390/block/dasd.c
index 29225e1c159c..e1d96344d733 100644
--- a/drivers/s390/block/dasd.c
+++ b/drivers/s390/block/dasd.c
@@ -1352,7 +1352,7 @@ int dasd_term_IO(struct dasd_ccw_req *cqr)
                 switch (rc) {
                 case 0: /* termination successful */
                         cqr->status = DASD_CQR_CLEAR_PENDING;
-                        cqr->stopclk = get_clock();
+                        cqr->stopclk = get_tod_clock();
                         cqr->starttime = 0;
                         DBF_DEV_EVENT(DBF_DEBUG, device,
                                       "terminate cqr %p successful",
@@ -1420,7 +1420,7 @@ int dasd_start_IO(struct dasd_ccw_req *cqr)
                 cqr->status = DASD_CQR_ERROR;
                 return -EIO;
         }
-        cqr->startclk = get_clock();
+        cqr->startclk = get_tod_clock();
         cqr->starttime = jiffies;
         cqr->retries--;
         if (!test_bit(DASD_CQR_VERIFY_PATH, &cqr->flags)) {
@@ -1623,7 +1623,7 @@ void dasd_int_handler(struct ccw_device *cdev, unsigned long intparm,
                 return;
         }
 
-        now = get_clock();
+        now = get_tod_clock();
         cqr = (struct dasd_ccw_req *) intparm;
         /* check for conditions that should be handled immediately */
         if (!cqr ||
@@ -1963,7 +1963,7 @@ int dasd_flush_device_queue(struct dasd_device *device)
                         }
                         break;
                 case DASD_CQR_QUEUED:
-                        cqr->stopclk = get_clock();
+                        cqr->stopclk = get_tod_clock();
                         cqr->status = DASD_CQR_CLEARED;
                         break;
                 default: /* no need to modify the others */
@@ -2210,7 +2210,7 @@ static int _dasd_sleep_on(struct dasd_ccw_req *maincqr, int interruptible)
                         wait_event(generic_waitq, _wait_for_wakeup(cqr));
         }
 
-        maincqr->endclk = get_clock();
+        maincqr->endclk = get_tod_clock();
         if ((maincqr->status != DASD_CQR_DONE) &&
             (maincqr->intrc != -ERESTARTSYS))
                 dasd_log_sense(maincqr, &maincqr->irb);
@@ -2340,7 +2340,7 @@ int dasd_cancel_req(struct dasd_ccw_req *cqr)
                                 "Cancelling request %p failed with rc=%d\n",
                                 cqr, rc);
                 } else {
-                        cqr->stopclk = get_clock();
+                        cqr->stopclk = get_tod_clock();
                 }
                 break;
         default: /* already finished or clear pending - do nothing */
@@ -2568,7 +2568,7 @@ restart:
                 }
 
                 /* Rechain finished requests to final queue */
-                cqr->endclk = get_clock();
+                cqr->endclk = get_tod_clock();
                 list_move_tail(&cqr->blocklist, final_queue);
         }
 }
@@ -2711,7 +2711,7 @@ restart_cb:
                 }
                 /* call the callback function */
                 spin_lock_irq(&block->request_queue_lock);
-                cqr->endclk = get_clock();
+                cqr->endclk = get_tod_clock();
                 list_del_init(&cqr->blocklist);
                 __dasd_cleanup_cqr(cqr);
                 spin_unlock_irq(&block->request_queue_lock);
@@ -3504,7 +3504,7 @@ static struct dasd_ccw_req *dasd_generic_build_rdc(struct dasd_device *device,
         cqr->memdev = device;
         cqr->expires = 10*HZ;
         cqr->retries = 256;
-        cqr->buildclk = get_clock();
+        cqr->buildclk = get_tod_clock();
         cqr->status = DASD_CQR_FILLED;
         return cqr;
 }
diff --git a/drivers/s390/block/dasd_3990_erp.c b/drivers/s390/block/dasd_3990_erp.c
index f8212d54013a..d26134713682 100644
--- a/drivers/s390/block/dasd_3990_erp.c
+++ b/drivers/s390/block/dasd_3990_erp.c
@@ -229,7 +229,7 @@ dasd_3990_erp_DCTL(struct dasd_ccw_req * erp, char modifier)
         dctl_cqr->expires = 5 * 60 * HZ;
         dctl_cqr->retries = 2;
 
-        dctl_cqr->buildclk = get_clock();
+        dctl_cqr->buildclk = get_tod_clock();
 
         dctl_cqr->status = DASD_CQR_FILLED;
 
@@ -1719,7 +1719,7 @@ dasd_3990_erp_action_1B_32(struct dasd_ccw_req * default_erp, char *sense)
         erp->magic = default_erp->magic;
         erp->expires = default_erp->expires;
         erp->retries = 256;
-        erp->buildclk = get_clock();
+        erp->buildclk = get_tod_clock();
         erp->status = DASD_CQR_FILLED;
 
         /* remove the default erp */
@@ -2322,7 +2322,7 @@ static struct dasd_ccw_req *dasd_3990_erp_add_erp(struct dasd_ccw_req *cqr)
                         DBF_DEV_EVENT(DBF_ERR, device, "%s",
                                     "Unable to allocate ERP request");
                         cqr->status = DASD_CQR_FAILED;
-                        cqr->stopclk = get_clock ();
+                        cqr->stopclk = get_tod_clock();
                 } else {
                         DBF_DEV_EVENT(DBF_ERR, device,
                                      "Unable to allocate ERP request "
@@ -2364,7 +2364,7 @@ static struct dasd_ccw_req *dasd_3990_erp_add_erp(struct dasd_ccw_req *cqr)
         erp->magic    = cqr->magic;
         erp->expires  = cqr->expires;
         erp->retries  = 256;
-        erp->buildclk = get_clock();
+        erp->buildclk = get_tod_clock();
         erp->status = DASD_CQR_FILLED;
 
         return erp;
diff --git a/drivers/s390/block/dasd_alias.c b/drivers/s390/block/dasd_alias.c
index 6b556995bb33..a2597e683e79 100644
--- a/drivers/s390/block/dasd_alias.c
+++ b/drivers/s390/block/dasd_alias.c
@@ -448,7 +448,7 @@ static int read_unit_address_configuration(struct dasd_device *device,
         ccw->count = sizeof(*(lcu->uac));
         ccw->cda = (__u32)(addr_t) lcu->uac;
 
-        cqr->buildclk = get_clock();
+        cqr->buildclk = get_tod_clock();
         cqr->status = DASD_CQR_FILLED;
 
         /* need to unset flag here to detect race with summary unit check */
@@ -733,7 +733,7 @@ static int reset_summary_unit_check(struct alias_lcu *lcu,
         cqr->memdev = device;
         cqr->block = NULL;
         cqr->expires = 5 * HZ;
-        cqr->buildclk = get_clock();
+        cqr->buildclk = get_tod_clock();
         cqr->status = DASD_CQR_FILLED;
 
         rc = dasd_sleep_on_immediatly(cqr);
diff --git a/drivers/s390/block/dasd_diag.c b/drivers/s390/block/dasd_diag.c
index 704488d0f819..cc0603358522 100644
--- a/drivers/s390/block/dasd_diag.c
+++ b/drivers/s390/block/dasd_diag.c
@@ -184,14 +184,14 @@ dasd_start_diag(struct dasd_ccw_req * cqr)
         private->iob.bio_list = dreq->bio;
         private->iob.flaga = DASD_DIAG_FLAGA_DEFAULT;
 
-        cqr->startclk = get_clock();
+        cqr->startclk = get_tod_clock();
         cqr->starttime = jiffies;
         cqr->retries--;
 
         rc = dia250(&private->iob, RW_BIO);
         switch (rc) {
         case 0: /* Synchronous I/O finished successfully */
-                cqr->stopclk = get_clock();
+                cqr->stopclk = get_tod_clock();
                 cqr->status = DASD_CQR_SUCCESS;
                 /* Indicate to calling function that only a dasd_schedule_bh()
                    and no timer is needed */
@@ -222,7 +222,7 @@ dasd_diag_term_IO(struct dasd_ccw_req * cqr)
         mdsk_term_io(device);
         mdsk_init_io(device, device->block->bp_block, 0, NULL);
         cqr->status = DASD_CQR_CLEAR_PENDING;
-        cqr->stopclk = get_clock();
+        cqr->stopclk = get_tod_clock();
         dasd_schedule_device_bh(device);
         return 0;
 }
@@ -276,7 +276,7 @@ static void dasd_ext_handler(struct ext_code ext_code,
                 return;
         }
 
-        cqr->stopclk = get_clock();
+        cqr->stopclk = get_tod_clock();
 
         expires = 0;
         if ((ext_code.subcode & 0xff) == 0) {
@@ -556,7 +556,7 @@ static struct dasd_ccw_req *dasd_diag_build_cp(struct dasd_device *memdev,
                 }
         }
         cqr->retries = DIAG_MAX_RETRIES;
-        cqr->buildclk = get_clock();
+        cqr->buildclk = get_tod_clock();
         if (blk_noretry_request(req) ||
             block->base->features & DASD_FEATURE_FAILFAST)
                 set_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags);
diff --git a/drivers/s390/block/dasd_eckd.c b/drivers/s390/block/dasd_eckd.c
index e37bc1620d14..33f26bfa62f2 100644
--- a/drivers/s390/block/dasd_eckd.c
+++ b/drivers/s390/block/dasd_eckd.c
@@ -862,7 +862,7 @@ static void dasd_eckd_fill_rcd_cqr(struct dasd_device *device,
         cqr->expires = 10*HZ;
         cqr->lpm = lpm;
         cqr->retries = 256;
-        cqr->buildclk = get_clock();
+        cqr->buildclk = get_tod_clock();
         cqr->status = DASD_CQR_FILLED;
         set_bit(DASD_CQR_VERIFY_PATH, &cqr->flags);
 }
@@ -1449,7 +1449,7 @@ static int dasd_eckd_read_features(struct dasd_device *device)
         ccw->count = sizeof(struct dasd_rssd_features);
         ccw->cda = (__u32)(addr_t) features;
 
-        cqr->buildclk = get_clock();
+        cqr->buildclk = get_tod_clock();
         cqr->status = DASD_CQR_FILLED;
         rc = dasd_sleep_on(cqr);
         if (rc == 0) {
@@ -1501,7 +1501,7 @@ static struct dasd_ccw_req *dasd_eckd_build_psf_ssc(struct dasd_device *device,
         cqr->block = NULL;
         cqr->retries = 256;
         cqr->expires = 10*HZ;
-        cqr->buildclk = get_clock();
+        cqr->buildclk = get_tod_clock();
         cqr->status = DASD_CQR_FILLED;
         return cqr;
 }
@@ -1841,7 +1841,7 @@ dasd_eckd_analysis_ccw(struct dasd_device *device)
         cqr->startdev = device;
         cqr->memdev = device;
         cqr->retries = 255;
-        cqr->buildclk = get_clock();
+        cqr->buildclk = get_tod_clock();
         cqr->status = DASD_CQR_FILLED;
         return cqr;
 }
@@ -2241,7 +2241,7 @@ dasd_eckd_format_device(struct dasd_device * device,
         fcp->startdev = device;
         fcp->memdev = device;
         fcp->retries = 256;
-        fcp->buildclk = get_clock();
+        fcp->buildclk = get_tod_clock();
         fcp->status = DASD_CQR_FILLED;
         return fcp;
 }
@@ -2530,7 +2530,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_single(
         cqr->expires = startdev->default_expires * HZ;  /* default 5 minutes */
         cqr->lpm = startdev->path_data.ppm;
         cqr->retries = 256;
-        cqr->buildclk = get_clock();
+        cqr->buildclk = get_tod_clock();
         cqr->status = DASD_CQR_FILLED;
         return cqr;
 }
@@ -2705,7 +2705,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_cmd_track(
         cqr->expires = startdev->default_expires * HZ;  /* default 5 minutes */
         cqr->lpm = startdev->path_data.ppm;
         cqr->retries = 256;
-        cqr->buildclk = get_clock();
+        cqr->buildclk = get_tod_clock();
         cqr->status = DASD_CQR_FILLED;
         return cqr;
 }
@@ -2998,7 +2998,7 @@ static struct dasd_ccw_req *dasd_eckd_build_cp_tpm_track(
         cqr->expires = startdev->default_expires * HZ;  /* default 5 minutes */
         cqr->lpm = startdev->path_data.ppm;
         cqr->retries = 256;
-        cqr->buildclk = get_clock();
+        cqr->buildclk = get_tod_clock();
         cqr->status = DASD_CQR_FILLED;
         return cqr;
 out_error:
@@ -3201,7 +3201,7 @@ static struct dasd_ccw_req *dasd_raw_build_cp(struct dasd_device *startdev,
         cqr->expires = startdev->default_expires * HZ;
         cqr->lpm = startdev->path_data.ppm;
         cqr->retries = 256;
-        cqr->buildclk = get_clock();
+        cqr->buildclk = get_tod_clock();
         cqr->status = DASD_CQR_FILLED;
 
         if (IS_ERR(cqr) && PTR_ERR(cqr) != -EAGAIN)
@@ -3402,7 +3402,7 @@ dasd_eckd_release(struct dasd_device *device)
         set_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags);
         cqr->retries = 2;       /* set retry counter to enable basic ERP */
         cqr->expires = 2 * HZ;
-        cqr->buildclk = get_clock();
+        cqr->buildclk = get_tod_clock();
         cqr->status = DASD_CQR_FILLED;
 
         rc = dasd_sleep_on_immediatly(cqr);
@@ -3457,7 +3457,7 @@ dasd_eckd_reserve(struct dasd_device *device)
         set_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags);
         cqr->retries = 2;       /* set retry counter to enable basic ERP */
         cqr->expires = 2 * HZ;
-        cqr->buildclk = get_clock();
+        cqr->buildclk = get_tod_clock();
         cqr->status = DASD_CQR_FILLED;
 
         rc = dasd_sleep_on_immediatly(cqr);
@@ -3511,7 +3511,7 @@ dasd_eckd_steal_lock(struct dasd_device *device)
         set_bit(DASD_CQR_FLAGS_FAILFAST, &cqr->flags);
         cqr->retries = 2;       /* set retry counter to enable basic ERP */
         cqr->expires = 2 * HZ;
-        cqr->buildclk = get_clock();
+        cqr->buildclk = get_tod_clock();
         cqr->status = DASD_CQR_FILLED;
 
         rc = dasd_sleep_on_immediatly(cqr);
@@ -3572,7 +3572,7 @@ static int dasd_eckd_snid(struct dasd_device *device,
         set_bit(DASD_CQR_ALLOW_SLOCK, &cqr->flags);
         cqr->retries = 5;
         cqr->expires = 10 * HZ;
-        cqr->buildclk = get_clock();
+        cqr->buildclk = get_tod_clock();
         cqr->status = DASD_CQR_FILLED;
         cqr->lpm = usrparm.path_mask;
 
@@ -3642,7 +3642,7 @@ dasd_eckd_performance(struct dasd_device *device, void __user *argp)
         ccw->count = sizeof(struct dasd_rssd_perf_stats_t);
         ccw->cda = (__u32)(addr_t) stats;
 
-        cqr->buildclk = get_clock();
+        cqr->buildclk = get_tod_clock();
         cqr->status = DASD_CQR_FILLED;
         rc = dasd_sleep_on(cqr);
         if (rc == 0) {
@@ -3768,7 +3768,7 @@ static int dasd_symm_io(struct dasd_device *device, void __user *argp)
         cqr->memdev = device;
         cqr->retries = 3;
         cqr->expires = 10 * HZ;
-        cqr->buildclk = get_clock();
+        cqr->buildclk = get_tod_clock();
         cqr->status = DASD_CQR_FILLED;
 
         /* Build the ccws */
diff --git a/drivers/s390/block/dasd_eer.c b/drivers/s390/block/dasd_eer.c
index ff901b5509c1..21ef63cf0960 100644
--- a/drivers/s390/block/dasd_eer.c
+++ b/drivers/s390/block/dasd_eer.c
@@ -481,7 +481,7 @@ int dasd_eer_enable(struct dasd_device *device)
         ccw->flags = 0;
         ccw->cda = (__u32)(addr_t) cqr->data;
 
-        cqr->buildclk = get_clock();
+        cqr->buildclk = get_tod_clock();
         cqr->status = DASD_CQR_FILLED;
         cqr->callback = dasd_eer_snss_cb;
 
diff --git a/drivers/s390/block/dasd_erp.c b/drivers/s390/block/dasd_erp.c
index d01ef82f8757..3250cb471f78 100644
--- a/drivers/s390/block/dasd_erp.c
+++ b/drivers/s390/block/dasd_erp.c
@@ -102,7 +102,7 @@ dasd_default_erp_action(struct dasd_ccw_req *cqr)
                 pr_err("%s: default ERP has run out of retries and failed\n",
                        dev_name(&device->cdev->dev));
                 cqr->status = DASD_CQR_FAILED;
-                cqr->stopclk = get_clock();
+                cqr->stopclk = get_tod_clock();
         }
         return cqr;
 }                               /* end dasd_default_erp_action */
@@ -146,7 +146,7 @@ struct dasd_ccw_req *dasd_default_erp_postaction(struct dasd_ccw_req *cqr)
                 cqr->status = DASD_CQR_DONE;
         else {
                 cqr->status = DASD_CQR_FAILED;
-                cqr->stopclk = get_clock();
+                cqr->stopclk = get_tod_clock();
         }
 
         return cqr;
diff --git a/drivers/s390/block/dasd_fba.c b/drivers/s390/block/dasd_fba.c
index 414698584344..4dd0e2f6047e 100644
--- a/drivers/s390/block/dasd_fba.c
+++ b/drivers/s390/block/dasd_fba.c
@@ -370,7 +370,7 @@ static struct dasd_ccw_req *dasd_fba_build_cp(struct dasd_device * memdev,
         cqr->block = block;
         cqr->expires = memdev->default_expires * HZ;    /* default 5 minutes */
         cqr->retries = 32;
-        cqr->buildclk = get_clock();
+        cqr->buildclk = get_tod_clock();
         cqr->status = DASD_CQR_FILLED;
         return cqr;
 }