tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

[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>

authored by Ursula Braun and committed by Martin Schwidefsky 584dfddf b1e2ba8d

-13
unified split
-7
arch/s390/include/asm/qdio.h
··· 321 #define QDIO_ERROR_ACTIVATE_CHECK_CONDITION 0x40 322 #define QDIO_ERROR_SLSB_STATE 0x80 323 324 - /* for qdio_initialize */ 325 - #define QDIO_INBOUND_0COPY_SBALS 0x01 326 - #define QDIO_OUTBOUND_0COPY_SBALS 0x02 327 - #define QDIO_USE_OUTBOUND_PCIS 0x04 328 - 329 /* for qdio_cleanup */ 330 #define QDIO_FLAG_CLEANUP_USING_CLEAR 0x01 331 #define QDIO_FLAG_CLEANUP_USING_HALT 0x02 ··· 339 * @input_handler: handler to be called for input queues 340 * @output_handler: handler to be called for output queues 341 * @int_parm: interruption parameter 342 - * @flags: initialization flags 343 * @input_sbal_addr_array: address of no_input_qs * 128 pointers 344 * @output_sbal_addr_array: address of no_output_qs * 128 pointers 345 */ ··· 355 qdio_handler_t *input_handler; 356 qdio_handler_t *output_handler; 357 unsigned long int_parm; 358 - unsigned long flags; 359 void **input_sbal_addr_array; 360 void **output_sbal_addr_array; 361 };
··· 321 #define QDIO_ERROR_ACTIVATE_CHECK_CONDITION 0x40 322 #define QDIO_ERROR_SLSB_STATE 0x80 323 324 /* for qdio_cleanup */ 325 #define QDIO_FLAG_CLEANUP_USING_CLEAR 0x01 326 #define QDIO_FLAG_CLEANUP_USING_HALT 0x02 ··· 344 * @input_handler: handler to be called for input queues 345 * @output_handler: handler to be called for output queues 346 * @int_parm: interruption parameter 347 * @input_sbal_addr_array: address of no_input_qs * 128 pointers 348 * @output_sbal_addr_array: address of no_output_qs * 128 pointers 349 */ ··· 361 qdio_handler_t *input_handler; 362 qdio_handler_t *output_handler; 363 unsigned long int_parm; 364 void **input_sbal_addr_array; 365 void **output_sbal_addr_array; 366 };
-1
drivers/s390/cio/qdio_debug.c
··· 33 DBF_HEX(&init_data->input_handler, sizeof(void *)); 34 DBF_HEX(&init_data->output_handler, sizeof(void *)); 35 DBF_HEX(&init_data->int_parm, sizeof(long)); 36 - DBF_HEX(&init_data->flags, sizeof(long)); 37 DBF_HEX(&init_data->input_sbal_addr_array, sizeof(void *)); 38 DBF_HEX(&init_data->output_sbal_addr_array, sizeof(void *)); 39 DBF_EVENT("irq:%8lx", (unsigned long)irq_ptr);
··· 33 DBF_HEX(&init_data->input_handler, sizeof(void *)); 34 DBF_HEX(&init_data->output_handler, sizeof(void *)); 35 DBF_HEX(&init_data->int_parm, sizeof(long)); 36 DBF_HEX(&init_data->input_sbal_addr_array, sizeof(void *)); 37 DBF_HEX(&init_data->output_sbal_addr_array, sizeof(void *)); 38 DBF_EVENT("irq:%8lx", (unsigned long)irq_ptr);
-3
drivers/s390/net/qeth_core_main.c
··· 3805 init_data.input_handler = card->discipline.input_handler; 3806 init_data.output_handler = card->discipline.output_handler; 3807 init_data.int_parm = (unsigned long) card; 3808 - init_data.flags = QDIO_INBOUND_0COPY_SBALS | 3809 - QDIO_OUTBOUND_0COPY_SBALS | 3810 - QDIO_USE_OUTBOUND_PCIS; 3811 init_data.input_sbal_addr_array = (void **) in_sbal_ptrs; 3812 init_data.output_sbal_addr_array = (void **) out_sbal_ptrs; 3813
··· 3805 init_data.input_handler = card->discipline.input_handler; 3806 init_data.output_handler = card->discipline.output_handler; 3807 init_data.int_parm = (unsigned long) card; 3808 init_data.input_sbal_addr_array = (void **) in_sbal_ptrs; 3809 init_data.output_sbal_addr_array = (void **) out_sbal_ptrs; 3810
-2
drivers/s390/scsi/zfcp_qdio.c
··· 319 id->input_handler = zfcp_qdio_int_resp; 320 id->output_handler = zfcp_qdio_int_req; 321 id->int_parm = (unsigned long) qdio; 322 - id->flags = QDIO_INBOUND_0COPY_SBALS | 323 - QDIO_OUTBOUND_0COPY_SBALS | QDIO_USE_OUTBOUND_PCIS; 324 id->input_sbal_addr_array = (void **) (qdio->resp_q.sbal); 325 id->output_sbal_addr_array = (void **) (qdio->req_q.sbal); 326
··· 319 id->input_handler = zfcp_qdio_int_resp; 320 id->output_handler = zfcp_qdio_int_req; 321 id->int_parm = (unsigned long) qdio; 322 id->input_sbal_addr_array = (void **) (qdio->resp_q.sbal); 323 id->output_sbal_addr_array = (void **) (qdio->req_q.sbal); 324