Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit b225cf9b8040849e16add4da8e84a72a3548ada8

Authored by Christof Schmitt
Committed by James Bottomley
1 parent b98478d71b
Exists in master and in 20 other branches dlt-processor-sdk-linux-03.00.00.04, newt-ti-linux-3.12.y, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.12.10, smarc-ti-linux-3.12.y, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.12.y, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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

Showing 3 changed files with 6 additions and 8 deletions Side-by-side Diff

drivers/s390/scsi/zfcp_dbf.c
Diff comments   View file @ b225cf9
... ... @@ -1249,7 +1249,7 @@
1249 1249 char dbf_name[DEBUG_MAX_NAME_LEN];
1250 1250  
1251 1251 /* debug feature area which records recovery activity */
1252   - sprintf(dbf_name, "zfcp_%s_rec", zfcp_get_busid_by_adapter(adapter));
  1252 + sprintf(dbf_name, "zfcp_%s_rec", dev_name(&adapter->ccw_device->dev));
1253 1253 adapter->rec_dbf = debug_register(dbf_name, dbfsize, 1,
1254 1254 sizeof(struct zfcp_rec_dbf_record));
1255 1255 if (!adapter->rec_dbf)
... ... @@ -1259,7 +1259,7 @@
1259 1259 debug_set_level(adapter->rec_dbf, 3);
1260 1260  
1261 1261 /* debug feature area which records HBA (FSF and QDIO) conditions */
1262   - sprintf(dbf_name, "zfcp_%s_hba", zfcp_get_busid_by_adapter(adapter));
  1262 + sprintf(dbf_name, "zfcp_%s_hba", dev_name(&adapter->ccw_device->dev));
1263 1263 adapter->hba_dbf = debug_register(dbf_name, dbfsize, 1,
1264 1264 sizeof(struct zfcp_hba_dbf_record));
1265 1265 if (!adapter->hba_dbf)
... ... @@ -1269,7 +1269,7 @@
1269 1269 debug_set_level(adapter->hba_dbf, 3);
1270 1270  
1271 1271 /* debug feature area which records SAN command failures and recovery */
1272   - sprintf(dbf_name, "zfcp_%s_san", zfcp_get_busid_by_adapter(adapter));
  1272 + sprintf(dbf_name, "zfcp_%s_san", dev_name(&adapter->ccw_device->dev));
1273 1273 adapter->san_dbf = debug_register(dbf_name, dbfsize, 1,
1274 1274 sizeof(struct zfcp_san_dbf_record));
1275 1275 if (!adapter->san_dbf)
... ... @@ -1279,7 +1279,7 @@
1279 1279 debug_set_level(adapter->san_dbf, 6);
1280 1280  
1281 1281 /* debug feature area which records SCSI command failures and recovery */
1282   - sprintf(dbf_name, "zfcp_%s_scsi", zfcp_get_busid_by_adapter(adapter));
  1282 + sprintf(dbf_name, "zfcp_%s_scsi", dev_name(&adapter->ccw_device->dev));
1283 1283 adapter->scsi_dbf = debug_register(dbf_name, dbfsize, 1,
1284 1284 sizeof(struct zfcp_scsi_dbf_record));
1285 1285 if (!adapter->scsi_dbf)
drivers/s390/scsi/zfcp_def.h
Diff comments   View file @ b225cf9
... ... @@ -602,8 +602,6 @@
602 602 #define ZFCP_SET 0x00000100
603 603 #define ZFCP_CLEAR 0x00000200
604 604  
605   -#define zfcp_get_busid_by_adapter(adapter) (dev_name(&adapter->ccw_device->dev))
606   -
607 605 /*
608 606 * Helper functions for request ID management.
609 607 */
drivers/s390/scsi/zfcp_qdio.c
Diff comments   View file @ b225cf9
... ... @@ -112,7 +112,7 @@
112 112 * corruption and must stop the machine immediatly.
113 113 */
114 114 panic("error: unknown request id (%lx) on adapter %s.\n",
115   - req_id, zfcp_get_busid_by_adapter(adapter));
  115 + req_id, dev_name(&adapter->ccw_device->dev));
116 116  
117 117 zfcp_reqlist_remove(adapter, fsf_req);
118 118 spin_unlock_irqrestore(&adapter->req_list_lock, flags);
... ... @@ -392,7 +392,7 @@
392 392  
393 393 init_data->cdev = adapter->ccw_device;
394 394 init_data->q_format = QDIO_ZFCP_QFMT;
395   - memcpy(init_data->adapter_name, zfcp_get_busid_by_adapter(adapter), 8);
  395 + memcpy(init_data->adapter_name, dev_name(&adapter->ccw_device->dev), 8);
396 396 ASCEBC(init_data->adapter_name, 8);
397 397 init_data->qib_param_field_format = 0;
398 398 init_data->qib_param_field = NULL;