[S390] cio: css_driver: Use consistent parameters.

[linux-2.6-omap-h63xx.git] / drivers / s390 / cio / qdio.c

diff --git a/drivers/s390/cio/qdio.c b/drivers/s390/cio/qdio.c
index 03347aed2b3e65b523486dccbc11a15054e7ab0b..40a3208c7cf3defbc2c47429a8a4654d32290630 100644 (file)
--- a/drivers/s390/cio/qdio.c
+++ b/drivers/s390/cio/qdio.c
@@ -195,6 +195,8 @@ qdio_do_eqbs(struct qdio_q *q, unsigned char *state,
 again:
        ccq = do_eqbs(irq->sch_token, state, q_no, start, cnt);
        rc = qdio_check_ccq(q, ccq);
+       if ((ccq == 96) && (tmp_cnt != *cnt))
+               rc = 0;
        if (rc == 1) {
                QDIO_DBF_TEXT5(1,trace,"eqAGAIN");
                goto again;
@@ -740,7 +742,8 @@ qdio_get_outbound_buffer_frontier(struct qdio_q *q)
        first_not_to_check=f+qdio_min(atomic_read(&q->number_of_buffers_used),
                                      (QDIO_MAX_BUFFERS_PER_Q-1));
 
-       if ((!q->is_iqdio_q)&&(!q->hydra_gives_outbound_pcis))
+       if (((!q->is_iqdio_q) && (!q->hydra_gives_outbound_pcis)) ||
+                (q->queue_type == QDIO_IQDIO_QFMT_ASYNCH))
                SYNC_MEMORY;
 
 check_next:
@@ -1021,9 +1024,9 @@ __qdio_outbound_processing(struct qdio_q *q)
 }
 
 static void
-qdio_outbound_processing(struct qdio_q *q)
+qdio_outbound_processing(unsigned long q)
 {
-       __qdio_outbound_processing(q);
+       __qdio_outbound_processing((struct qdio_q *) q);
 }
 
 /************************* INBOUND ROUTINES *******************************/
@@ -1446,9 +1449,10 @@ out:
 }
 
 static void
-tiqdio_inbound_processing(struct qdio_q *q)
+tiqdio_inbound_processing(unsigned long q)
 {
-       __tiqdio_inbound_processing(q, atomic_read(&spare_indicator_usecount));
+       __tiqdio_inbound_processing((struct qdio_q *) q,
+                                   atomic_read(&spare_indicator_usecount));
 }
 
 static void
@@ -1491,9 +1495,9 @@ again:
 }
 
 static void
-qdio_inbound_processing(struct qdio_q *q)
+qdio_inbound_processing(unsigned long q)
 {
-       __qdio_inbound_processing(q);
+       __qdio_inbound_processing((struct qdio_q *) q);
 }
 
 /************************* MAIN ROUTINES *******************************/
@@ -1757,12 +1761,15 @@ qdio_fill_qs(struct qdio_irq *irq_ptr, struct ccw_device *cdev,
                q->handler=input_handler;
                q->dev_st_chg_ind=irq_ptr->dev_st_chg_ind;
 
-               q->tasklet.data=(unsigned long)q;
                /* q->is_thinint_q isn't valid at this time, but
-                * irq_ptr->is_thinint_irq is */
-               q->tasklet.func=(void(*)(unsigned long))
-                       ((irq_ptr->is_thinint_irq)?&tiqdio_inbound_processing:
-                        &qdio_inbound_processing);
+                * irq_ptr->is_thinint_irq is
+                */
+               if (irq_ptr->is_thinint_irq)
+                       tasklet_init(&q->tasklet, tiqdio_inbound_processing,
+                                    (unsigned long) q);
+               else
+                       tasklet_init(&q->tasklet, qdio_inbound_processing,
+                                    (unsigned long) q);
 
                /* actually this is not used for inbound queues. yet. */
                atomic_set(&q->busy_siga_counter,0);
@@ -1833,13 +1840,10 @@ qdio_fill_qs(struct qdio_irq *irq_ptr, struct ccw_device *cdev,
                q->last_move_ftc=0;
                q->handler=output_handler;
 
-               q->tasklet.data=(unsigned long)q;
-               q->tasklet.func=(void(*)(unsigned long))
-                       &qdio_outbound_processing;
-               q->timer.function=(void(*)(unsigned long))
-                       &qdio_outbound_processing;
-               q->timer.data = (long)q;
-               init_timer(&q->timer);
+               tasklet_init(&q->tasklet, qdio_outbound_processing,
+                            (unsigned long) q);
+               setup_timer(&q->timer, qdio_outbound_processing,
+                           (unsigned long) q);
 
                atomic_set(&q->busy_siga_counter,0);
                q->timing.busy_start=0;
@@ -3723,7 +3727,7 @@ qdio_performance_stats_store(struct bus_type *bus, const char *buf, size_t count
 #endif /* CONFIG_64BIT */
                }
        } else {
-               QDIO_PRINT_WARN("QDIO performance_stats: write 0 or 1 to this file!\n");
+               QDIO_PRINT_ERR("QDIO performance_stats: write 0 or 1 to this file!\n");
                return -EINVAL;
        }
        return count;