Commit 9f79b549 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by Vasily Gorbik
Browse files

s390/qdio: remove unused support for SLIB parameters 



Neither of the two drivers provides any SLIB parameter data, so get rid
of the dead code.

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Reviewed-by: default avatarBenjamin Block <bblock@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent 44d9a21a

arch/s390/include/asm/qdio.h

+0 −4
Original line number Diff line number Diff line
@@ -311,8 +311,6 @@ typedef void qdio_handler_t(struct ccw_device *, unsigned int, int, 
 * @qib_param_field_format: format for qib_parm_field

 * @qib_param_field: pointer to 128 bytes or NULL, if no param field

 * @qib_rflags: rflags to set

 * @input_slib_elements: pointer to no_input_qs * 128 words of data or NULL

 * @output_slib_elements: pointer to no_output_qs * 128 words of data or NULL

 * @no_input_qs: number of input queues

 * @no_output_qs: number of output queues

 * @input_handler: handler to be called for input queues
@@ -329,8 +327,6 @@ struct qdio_initialize { 
	unsigned int qib_param_field_format;

	unsigned char *qib_param_field;

	unsigned char qib_rflags;

	unsigned long *input_slib_elements;

	unsigned long *output_slib_elements;

	unsigned int no_input_qs;

	unsigned int no_output_qs;

	qdio_handler_t *input_handler;

drivers/s390/cio/qdio_main.c

+0 −2
Original line number Diff line number Diff line
@@ -952,8 +952,6 @@ static void qdio_trace_init_data(struct qdio_irq *irq, 
	DBF_DEV_EVENT(DBF_ERR, irq, "qfmt:%1u", data->q_format);

	DBF_DEV_EVENT(DBF_ERR, irq, "qpff%4x", data->qib_param_field_format);

	DBF_DEV_HEX(irq, &data->qib_param_field, sizeof(void *), DBF_ERR);

	DBF_DEV_HEX(irq, &data->input_slib_elements, sizeof(void *), DBF_ERR);

	DBF_DEV_HEX(irq, &data->output_slib_elements, sizeof(void *), DBF_ERR);

	DBF_DEV_EVENT(DBF_ERR, irq, "niq:%1u noq:%1u", data->no_input_qs,

		      data->no_output_qs);

	DBF_DEV_HEX(irq, &data->input_handler, sizeof(void *), DBF_ERR);

drivers/s390/cio/qdio_setup.c

+0 −36
Original line number Diff line number Diff line
@@ -89,39 +89,6 @@ void qdio_reset_buffers(struct qdio_buffer **buf, unsigned int count) 
}

EXPORT_SYMBOL_GPL(qdio_reset_buffers);



/*

 * qib_param_field: pointer to 128 bytes or NULL, if no param field

 * nr_input_qs: pointer to nr_queues*128 words of data or NULL

 */

static void set_impl_params(struct qdio_irq *irq_ptr,

			    unsigned long *input_slib_elements,

			    unsigned long *output_slib_elements)

{

	struct qdio_q *q;

	int i, j;



	if (!irq_ptr)

		return;



	if (!input_slib_elements)

		goto output;



	for_each_input_queue(irq_ptr, q, i) {

		for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; j++)

			q->slib->slibe[j].parms =

				input_slib_elements[i * QDIO_MAX_BUFFERS_PER_Q + j];

	}

output:

	if (!output_slib_elements)

		return;



	for_each_output_queue(irq_ptr, q, i) {

		for (j = 0; j < QDIO_MAX_BUFFERS_PER_Q; j++)

			q->slib->slibe[j].parms =

				output_slib_elements[i * QDIO_MAX_BUFFERS_PER_Q + j];

	}

}



static void __qdio_free_queues(struct qdio_q **queues, unsigned int count)

{

	struct qdio_q *q;
@@ -421,9 +388,6 @@ int qdio_setup_irq(struct qdio_irq *irq_ptr, struct qdio_initialize *init_data) 
	set_bit(QDIO_IRQ_DISABLED, &irq_ptr->poll_state);



	setup_qib(irq_ptr, init_data);

	set_impl_params(irq_ptr,

			init_data->input_slib_elements,

			init_data->output_slib_elements);



	/* fill input and output descriptors */

	setup_qdr(irq_ptr, init_data);