[S390] remove unused qdio flags in zfcp and qeth

zfcp and qeth are setting flags for the qdio-layer, but these flags
are not used in qdio. Patch removes the flag definitions from qdio
and their settings in zfcp and qeth.

Cc: Jan Glauber <jang@linux.vnet.ibm.com>
Cc: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: Ursula Braun <ursula.braun@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

diff --git a/arch/s390/include/asm/qdio.h b/arch/s390/include/asm/qdio.h
index c666bfe5e9847dc055ad7bcc5f7c863afa89f4cb..9b04b1102bbcf4023469ac250e1f6afd46da8eb7 100644 (file)
--- a/arch/s390/include/asm/qdio.h
+++ b/arch/s390/include/asm/qdio.h
@@ -321,11 +321,6 @@ typedef void qdio_handler_t(struct ccw_device *, unsigned int, int,
 #define QDIO_ERROR_ACTIVATE_CHECK_CONDITION    0x40
 #define QDIO_ERROR_SLSB_STATE                  0x80
 
-/* for qdio_initialize */
-#define QDIO_INBOUND_0COPY_SBALS               0x01
-#define QDIO_OUTBOUND_0COPY_SBALS              0x02
-#define QDIO_USE_OUTBOUND_PCIS                 0x04
-
 /* for qdio_cleanup */
 #define QDIO_FLAG_CLEANUP_USING_CLEAR          0x01
 #define QDIO_FLAG_CLEANUP_USING_HALT           0x02
@@ -344,7 +339,6 @@ typedef void qdio_handler_t(struct ccw_device *, unsigned int, int,
  * @input_handler: handler to be called for input queues
  * @output_handler: handler to be called for output queues
  * @int_parm: interruption parameter
- * @flags: initialization flags
  * @input_sbal_addr_array:  address of no_input_qs * 128 pointers
  * @output_sbal_addr_array: address of no_output_qs * 128 pointers
  */
@@ -361,7 +355,6 @@ struct qdio_initialize {
        qdio_handler_t *input_handler;
        qdio_handler_t *output_handler;
        unsigned long int_parm;
-       unsigned long flags;
        void **input_sbal_addr_array;
        void **output_sbal_addr_array;
 };

diff --git a/drivers/s390/cio/qdio_debug.c b/drivers/s390/cio/qdio_debug.c
index c94eb2a0fa2ed2fb3c02f807b1dabc762a9d680f..6ce83f56d5371c5acdd0a216b9992019188a6e69 100644 (file)
--- a/drivers/s390/cio/qdio_debug.c
+++ b/drivers/s390/cio/qdio_debug.c
@@ -33,7 +33,6 @@ void qdio_allocate_dbf(struct qdio_initialize *init_data,
        DBF_HEX(&init_data->input_handler, sizeof(void *));
        DBF_HEX(&init_data->output_handler, sizeof(void *));
        DBF_HEX(&init_data->int_parm, sizeof(long));
-       DBF_HEX(&init_data->flags, sizeof(long));
        DBF_HEX(&init_data->input_sbal_addr_array, sizeof(void *));
        DBF_HEX(&init_data->output_sbal_addr_array, sizeof(void *));
        DBF_EVENT("irq:%8lx", (unsigned long)irq_ptr);

diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index fa8a519218acc81f1b4af5e252d5cb8fc5beb4a6..7d25bdd443cd482a90ce184ba95a8ebec9900813 100644 (file)
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -3805,9 +3805,6 @@ static int qeth_qdio_establish(struct qeth_card *card)
        init_data.input_handler          = card->discipline.input_handler;
        init_data.output_handler         = card->discipline.output_handler;
        init_data.int_parm               = (unsigned long) card;
-       init_data.flags                  = QDIO_INBOUND_0COPY_SBALS |
-                                          QDIO_OUTBOUND_0COPY_SBALS |
-                                          QDIO_USE_OUTBOUND_PCIS;
        init_data.input_sbal_addr_array  = (void **) in_sbal_ptrs;
        init_data.output_sbal_addr_array = (void **) out_sbal_ptrs;
 

diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c
index 71b97ff77cf0a2d0885b89c96c1e0ac522ab55b7..6479273a30940bd93743d6d66192fa03080b40ce 100644 (file)
--- a/drivers/s390/scsi/zfcp_qdio.c
+++ b/drivers/s390/scsi/zfcp_qdio.c
@@ -319,8 +319,6 @@ static void zfcp_qdio_setup_init_data(struct qdio_initialize *id,
        id->input_handler = zfcp_qdio_int_resp;
        id->output_handler = zfcp_qdio_int_req;
        id->int_parm = (unsigned long) qdio;
-       id->flags = QDIO_INBOUND_0COPY_SBALS |
-                   QDIO_OUTBOUND_0COPY_SBALS | QDIO_USE_OUTBOUND_PCIS;
        id->input_sbal_addr_array = (void **) (qdio->resp_q.sbal);
        id->output_sbal_addr_array = (void **) (qdio->req_q.sbal);