Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b225cf9b authored by Christof Schmitt's avatar Christof Schmitt Committed by James Bottomley
Browse files

[SCSI] zfcp: Remove busid macro 



With the change to the dev_ message macros, the macro to get the busid
is only used in a few places. Remove it and directly get the dev_name
from the device.

Signed-off-by: default avatarChristof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent b98478d7

drivers/s390/scsi/zfcp_dbf.c

+4 −4
Original line number Diff line number Diff line
@@ -1249,7 +1249,7 @@ int zfcp_adapter_debug_register(struct zfcp_adapter *adapter) 
	char dbf_name[DEBUG_MAX_NAME_LEN];



	/* debug feature area which records recovery activity */

	sprintf(dbf_name, "zfcp_%s_rec", zfcp_get_busid_by_adapter(adapter));

	sprintf(dbf_name, "zfcp_%s_rec", dev_name(&adapter->ccw_device->dev));

	adapter->rec_dbf = debug_register(dbf_name, dbfsize, 1,

					  sizeof(struct zfcp_rec_dbf_record));

	if (!adapter->rec_dbf)
@@ -1259,7 +1259,7 @@ int zfcp_adapter_debug_register(struct zfcp_adapter *adapter) 
	debug_set_level(adapter->rec_dbf, 3);



	/* debug feature area which records HBA (FSF and QDIO) conditions */

	sprintf(dbf_name, "zfcp_%s_hba", zfcp_get_busid_by_adapter(adapter));

	sprintf(dbf_name, "zfcp_%s_hba", dev_name(&adapter->ccw_device->dev));

	adapter->hba_dbf = debug_register(dbf_name, dbfsize, 1,

					  sizeof(struct zfcp_hba_dbf_record));

	if (!adapter->hba_dbf)
@@ -1269,7 +1269,7 @@ int zfcp_adapter_debug_register(struct zfcp_adapter *adapter) 
	debug_set_level(adapter->hba_dbf, 3);



	/* debug feature area which records SAN command failures and recovery */

	sprintf(dbf_name, "zfcp_%s_san", zfcp_get_busid_by_adapter(adapter));

	sprintf(dbf_name, "zfcp_%s_san", dev_name(&adapter->ccw_device->dev));

	adapter->san_dbf = debug_register(dbf_name, dbfsize, 1,

					  sizeof(struct zfcp_san_dbf_record));

	if (!adapter->san_dbf)
@@ -1279,7 +1279,7 @@ int zfcp_adapter_debug_register(struct zfcp_adapter *adapter) 
	debug_set_level(adapter->san_dbf, 6);



	/* debug feature area which records SCSI command failures and recovery */

	sprintf(dbf_name, "zfcp_%s_scsi", zfcp_get_busid_by_adapter(adapter));

	sprintf(dbf_name, "zfcp_%s_scsi", dev_name(&adapter->ccw_device->dev));

	adapter->scsi_dbf = debug_register(dbf_name, dbfsize, 1,

					   sizeof(struct zfcp_scsi_dbf_record));

	if (!adapter->scsi_dbf)

drivers/s390/scsi/zfcp_def.h

+0 −2
Original line number Diff line number Diff line
@@ -602,8 +602,6 @@ struct zfcp_fsf_req_qtcb { 
#define ZFCP_SET                0x00000100

#define ZFCP_CLEAR              0x00000200



#define zfcp_get_busid_by_adapter(adapter) (dev_name(&adapter->ccw_device->dev))



/*

 * Helper functions for request ID management.

 */

drivers/s390/scsi/zfcp_qdio.c

+2 −2
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ static void zfcp_qdio_reqid_check(struct zfcp_adapter *adapter, 
		 * corruption and must stop the machine immediatly.

		 */

		panic("error: unknown request id (%lx) on adapter %s.\n",

		      req_id, zfcp_get_busid_by_adapter(adapter));

		      req_id, dev_name(&adapter->ccw_device->dev));



	zfcp_reqlist_remove(adapter, fsf_req);

	spin_unlock_irqrestore(&adapter->req_list_lock, flags);
@@ -392,7 +392,7 @@ int zfcp_qdio_allocate(struct zfcp_adapter *adapter) 


	init_data->cdev = adapter->ccw_device;

	init_data->q_format = QDIO_ZFCP_QFMT;

	memcpy(init_data->adapter_name, zfcp_get_busid_by_adapter(adapter), 8);

	memcpy(init_data->adapter_name, dev_name(&adapter->ccw_device->dev), 8);

	ASCEBC(init_data->adapter_name, 8);

	init_data->qib_param_field_format = 0;

	init_data->qib_param_field = NULL;