Commit 180a4c42 authored by Julian Wiedmann's avatar Julian Wiedmann Committed by Vasily Gorbik
Browse files

s390/qdio: always use dev_name() for device name in QIB 



Passing a custom name from the device driver is nice - but in practice
it's only zfcp who has been using this. So we might as well hard-code
a naming scheme in the qdio layer, so that qeth also benefits from it.

Signed-off-by: default avatarJulian Wiedmann <jwi@linux.ibm.com>
Reviewed-by: default avatarSteffen Maier <maier@linux.ibm.com>
Signed-off-by: default avatarVasily Gorbik <gor@linux.ibm.com>
parent b02002cc

arch/s390/include/asm/qdio.h

+0 −2
Original line number Diff line number Diff line
@@ -327,7 +327,6 @@ typedef void qdio_handler_t(struct ccw_device *, unsigned int, int, 
 * struct qdio_initialize - qdio initialization data

 * @q_format: queue format

 * @qdr_ac: feature flags to set

 * @adapter_name: name for the adapter

 * @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
@@ -347,7 +346,6 @@ typedef void qdio_handler_t(struct ccw_device *, unsigned int, int, 
struct qdio_initialize {

	unsigned char q_format;

	unsigned char qdr_ac;

	unsigned char adapter_name[8];

	unsigned int qib_param_field_format;

	unsigned char *qib_param_field;

	unsigned char qib_rflags;

drivers/s390/cio/qdio_main.c

+0 −1
Original line number Diff line number Diff line
@@ -1219,7 +1219,6 @@ static void qdio_trace_init_data(struct qdio_irq *irq, 
				 struct qdio_initialize *data)

{

	DBF_DEV_EVENT(DBF_ERR, irq, "qfmt:%1u", data->q_format);

	DBF_DEV_HEX(irq, data->adapter_name, 8, DBF_ERR);

	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);

drivers/s390/cio/qdio_setup.c

+4 −1
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ 
#include <linux/slab.h>

#include <linux/export.h>

#include <linux/io.h>



#include <asm/ebcdic.h>

#include <asm/qdio.h>



#include "cio.h"
@@ -452,7 +454,8 @@ static void setup_qib(struct qdio_irq *irq_ptr, 
	if (init_data->no_output_qs)

		irq_ptr->qib.osliba =

			(unsigned long)(irq_ptr->output_qs[0]->slib);

	memcpy(irq_ptr->qib.ebcnam, init_data->adapter_name, 8);

	memcpy(irq_ptr->qib.ebcnam, dev_name(&irq_ptr->cdev->dev), 8);

	ASCEBC(irq_ptr->qib.ebcnam, 8);

}



int qdio_setup_irq(struct qdio_irq *irq_ptr, struct qdio_initialize *init_data)

drivers/s390/scsi/zfcp_qdio.c

+0 −2
Original line number Diff line number Diff line
@@ -380,8 +380,6 @@ int zfcp_qdio_open(struct zfcp_qdio *qdio) 
			  &qdio->adapter->status);



	init_data.q_format = QDIO_ZFCP_QFMT;

	memcpy(init_data.adapter_name, dev_name(&cdev->dev), 8);

	ASCEBC(init_data.adapter_name, 8);

	init_data.qib_rflags = QIB_RFLAGS_ENABLE_DATA_DIV;

	if (enable_multibuffer)

		init_data.qdr_ac |= QDR_AC_MULTI_BUFFER_ENABLE;

CRA Git | Maintained and supported by SUSTech CRA and CCSE