aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/s390/block/dasd_3990_erp.c
diff options
context:
space:
mode:
authorHeiko Carstens <heiko.carstens@de.ibm.com>2013-01-30 03:49:40 -0500
committerMartin Schwidefsky <schwidefsky@de.ibm.com>2013-02-14 09:55:10 -0500
commit1aae0560d160ee6ebef927a35e4f405306a079df (patch)
tree70809629dccba1bf31e067dfcd3a20fe58b6d24e /drivers/s390/block/dasd_3990_erp.c
parent58fece7827a7cc40e02bc68a7db8229166984893 (diff)
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>
Diffstat (limited to 'drivers/s390/block/dasd_3990_erp.c')
-rw-r--r--drivers/s390/block/dasd_3990_erp.c8
1 files changed, 4 insertions, 4 deletions
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)
229 dctl_cqr->expires = 5 * 60 * HZ; 229 dctl_cqr->expires = 5 * 60 * HZ;
230 dctl_cqr->retries = 2; 230 dctl_cqr->retries = 2;
231 231
232 dctl_cqr->buildclk = get_clock(); 232 dctl_cqr->buildclk = get_tod_clock();
233 233
234 dctl_cqr->status = DASD_CQR_FILLED; 234 dctl_cqr->status = DASD_CQR_FILLED;
235 235
@@ -1719,7 +1719,7 @@ dasd_3990_erp_action_1B_32(struct dasd_ccw_req * default_erp, char *sense)
1719 erp->magic = default_erp->magic; 1719 erp->magic = default_erp->magic;
1720 erp->expires = default_erp->expires; 1720 erp->expires = default_erp->expires;
1721 erp->retries = 256; 1721 erp->retries = 256;
1722 erp->buildclk = get_clock(); 1722 erp->buildclk = get_tod_clock();
1723 erp->status = DASD_CQR_FILLED; 1723 erp->status = DASD_CQR_FILLED;
1724 1724
1725 /* remove the default erp */ 1725 /* remove the default erp */
@@ -2322,7 +2322,7 @@ static struct dasd_ccw_req *dasd_3990_erp_add_erp(struct dasd_ccw_req *cqr)
2322 DBF_DEV_EVENT(DBF_ERR, device, "%s", 2322 DBF_DEV_EVENT(DBF_ERR, device, "%s",
2323 "Unable to allocate ERP request"); 2323 "Unable to allocate ERP request");
2324 cqr->status = DASD_CQR_FAILED; 2324 cqr->status = DASD_CQR_FAILED;
2325 cqr->stopclk = get_clock (); 2325 cqr->stopclk = get_tod_clock();
2326 } else { 2326 } else {
2327 DBF_DEV_EVENT(DBF_ERR, device, 2327 DBF_DEV_EVENT(DBF_ERR, device,
2328 "Unable to allocate ERP request " 2328 "Unable to allocate ERP request "
@@ -2364,7 +2364,7 @@ static struct dasd_ccw_req *dasd_3990_erp_add_erp(struct dasd_ccw_req *cqr)
2364 erp->magic = cqr->magic; 2364 erp->magic = cqr->magic;
2365 erp->expires = cqr->expires; 2365 erp->expires = cqr->expires;
2366 erp->retries = 256; 2366 erp->retries = 256;
2367 erp->buildclk = get_clock(); 2367 erp->buildclk = get_tod_clock();
2368 erp->status = DASD_CQR_FILLED; 2368 erp->status = DASD_CQR_FILLED;
2369 2369
2370 return erp; 2370 return erp;