diff options
author | Heiko Carstens <heiko.carstens@de.ibm.com> | 2013-01-30 03:49:40 -0500 |
---|---|---|
committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-02-14 09:55:10 -0500 |
commit | 1aae0560d160ee6ebef927a35e4f405306a079df (patch) | |
tree | 70809629dccba1bf31e067dfcd3a20fe58b6d24e /drivers/s390/cio/qdio_main.c | |
parent | 58fece7827a7cc40e02bc68a7db8229166984893 (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/cio/qdio_main.c')
-rw-r--r-- | drivers/s390/cio/qdio_main.c | 12 |
1 files changed, 6 insertions, 6 deletions
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: | |||
338 | retries++; | 338 | retries++; |
339 | 339 | ||
340 | if (!start_time) { | 340 | if (!start_time) { |
341 | start_time = get_clock(); | 341 | start_time = get_tod_clock(); |
342 | goto again; | 342 | goto again; |
343 | } | 343 | } |
344 | if ((get_clock() - start_time) < QDIO_BUSY_BIT_PATIENCE) | 344 | if ((get_tod_clock() - start_time) < QDIO_BUSY_BIT_PATIENCE) |
345 | goto again; | 345 | goto again; |
346 | } | 346 | } |
347 | if (retries) { | 347 | if (retries) { |
@@ -504,7 +504,7 @@ static int get_inbound_buffer_frontier(struct qdio_q *q) | |||
504 | int count, stop; | 504 | int count, stop; |
505 | unsigned char state = 0; | 505 | unsigned char state = 0; |
506 | 506 | ||
507 | q->timestamp = get_clock(); | 507 | q->timestamp = get_tod_clock(); |
508 | 508 | ||
509 | /* | 509 | /* |
510 | * Don't check 128 buffers, as otherwise qdio_inbound_q_moved | 510 | * 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) | |||
563 | if (bufnr != q->last_move) { | 563 | if (bufnr != q->last_move) { |
564 | q->last_move = bufnr; | 564 | q->last_move = bufnr; |
565 | if (!is_thinint_irq(q->irq_ptr) && MACHINE_IS_LPAR) | 565 | if (!is_thinint_irq(q->irq_ptr) && MACHINE_IS_LPAR) |
566 | q->u.in.timestamp = get_clock(); | 566 | q->u.in.timestamp = get_tod_clock(); |
567 | return 1; | 567 | return 1; |
568 | } else | 568 | } else |
569 | return 0; | 569 | return 0; |
@@ -595,7 +595,7 @@ static inline int qdio_inbound_q_done(struct qdio_q *q) | |||
595 | * At this point we know, that inbound first_to_check | 595 | * At this point we know, that inbound first_to_check |
596 | * has (probably) not moved (see qdio_inbound_processing). | 596 | * has (probably) not moved (see qdio_inbound_processing). |
597 | */ | 597 | */ |
598 | if (get_clock() > q->u.in.timestamp + QDIO_INPUT_THRESHOLD) { | 598 | if (get_tod_clock() > q->u.in.timestamp + QDIO_INPUT_THRESHOLD) { |
599 | DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "in done:%02x", | 599 | DBF_DEV_EVENT(DBF_INFO, q->irq_ptr, "in done:%02x", |
600 | q->first_to_check); | 600 | q->first_to_check); |
601 | return 1; | 601 | return 1; |
@@ -772,7 +772,7 @@ static int get_outbound_buffer_frontier(struct qdio_q *q) | |||
772 | int count, stop; | 772 | int count, stop; |
773 | unsigned char state = 0; | 773 | unsigned char state = 0; |
774 | 774 | ||
775 | q->timestamp = get_clock(); | 775 | q->timestamp = get_tod_clock(); |
776 | 776 | ||
777 | if (need_siga_sync(q)) | 777 | if (need_siga_sync(q)) |
778 | if (((queue_type(q) != QDIO_IQDIO_QFMT) && | 778 | if (((queue_type(q) != QDIO_IQDIO_QFMT) && |