[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: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/drivers/s390/scsi/zfcp_qdio.c b/drivers/s390/scsi/zfcp_qdio.c
index d3b55fb66f13..33e0a206a0a4 100644
--- a/drivers/s390/scsi/zfcp_qdio.c
+++ b/drivers/s390/scsi/zfcp_qdio.c
@@ -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;