Merge commit 'v2.6.31-rc1' into dmaengine

[safe/jmp/linux-2.6] / drivers / s390 / cio / qdio.h

diff --git a/drivers/s390/cio/qdio.h b/drivers/s390/cio/qdio.h
index c60f256..b1241f8 100644 (file)
--- a/drivers/s390/cio/qdio.h
+++ b/drivers/s390/cio/qdio.h
@@ -14,7 +14,6 @@
 #include "chsc.h"
 
 #define QDIO_BUSY_BIT_PATIENCE         100     /* 100 microseconds */
-#define QDIO_BUSY_BIT_GIVE_UP          2000000 /* 2 seconds = eternity */
 #define QDIO_INPUT_THRESHOLD           500     /* 500 microseconds */
 
 /*
@@ -187,6 +186,9 @@ struct qdio_input_q {
        /* input buffer acknowledgement flag */
        int polling;
 
+       /* first ACK'ed buffer */
+       int ack_start;
+
        /* how much sbals are acknowledged with qebsm */
        int ack_count;
 
@@ -195,12 +197,6 @@ struct qdio_input_q {
 };
 
 struct qdio_output_q {
-       /* failed siga-w attempts*/
-       atomic_t busy_siga_counter;
-
-       /* start time of busy condition */
-       u64 timestamp;
-
        /* PCIs are enabled for the queue */
        int pci_out_enabled;
 
@@ -241,7 +237,7 @@ struct qdio_q {
        int first_to_check;
 
        /* first_to_check of the last time */
-       int last_move_ftc;
+       int last_move;
 
        /* beginning position for calling the program */
        int first_to_kick;
@@ -355,15 +351,6 @@ static inline unsigned long long get_usecs(void)
        ((bufnr - dec) & QDIO_MAX_BUFFERS_MASK)
 
 /* prototypes for thin interrupt */
-void qdio_sync_after_thinint(struct qdio_q *q);
-int get_buf_state(struct qdio_q *q, unsigned int bufnr, unsigned char *state,
-                 int auto_ack);
-void qdio_check_outbound_after_thinint(struct qdio_q *q);
-int qdio_inbound_q_moved(struct qdio_q *q);
-void qdio_kick_inbound_handler(struct qdio_q *q);
-void qdio_stop_polling(struct qdio_q *q);
-int qdio_siga_sync_q(struct qdio_q *q);
-
 void qdio_setup_thinint(struct qdio_irq *irq_ptr);
 int qdio_establish_thinint(struct qdio_irq *irq_ptr);
 void qdio_shutdown_thinint(struct qdio_irq *irq_ptr);
@@ -396,4 +383,6 @@ void qdio_setup_destroy_sysfs(struct ccw_device *cdev);
 int qdio_setup_init(void);
 void qdio_setup_exit(void);
 
+int debug_get_buf_state(struct qdio_q *q, unsigned int bufnr,
+                       unsigned char *state);
 #endif /* _CIO_QDIO_H */