diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-31 08:14:29 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-31 08:14:29 +0100 |
| commit | 5fdf7e5975a0b0f6a0370655612c5dca3fd6311b (patch) | |
| tree | 639c536e818c6ace974aa285ba94576df0353b01 /drivers/s390/scsi/zfcp_qdio.c | |
| parent | relayfs: replace BUG() with WARN_ON() in relay_late_setup_files() (diff) | |
| parent | Merge branch 'for-linus' of git://oss.sgi.com/xfs/xfs (diff) | |
| download | linux-5fdf7e5975a0b0f6a0370655612c5dca3fd6311b.tar.xz linux-5fdf7e5975a0b0f6a0370655612c5dca3fd6311b.zip | |
Merge branch 'linus' into tracing/kmemtrace
Conflicts:
mm/slub.c
Diffstat (limited to 'drivers/s390/scsi/zfcp_qdio.c')
| -rw-r--r-- | drivers/s390/scsi/zfcp_qdio.c | 4 |
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; |