Skip to content

Commit

Permalink
[SCSI] zfcp: Update dbf calls
Browse files Browse the repository at this point in the history
Change the dbf data and functions to use the zfcp_dbf prefix
throughout the code. Also change the calls to dbf to use zfcp_dbf
instead of zfcp_adapter.

Signed-off-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
  • Loading branch information
Swen Schillig authored and James Bottomley committed Sep 5, 2009
1 parent 799b76d commit 5771710
Show file tree
Hide file tree
Showing 9 changed files with 347 additions and 380 deletions.
7 changes: 4 additions & 3 deletions drivers/s390/scsi/zfcp_aux.c
Original file line number Diff line number Diff line change
Expand Up @@ -517,6 +517,7 @@ int zfcp_adapter_enqueue(struct ccw_device *ccw_device)
goto qdio_mem_failed;

adapter->qdio->adapter = adapter;

ccw_device->handler = NULL;
adapter->ccw_device = ccw_device;
atomic_set(&adapter->refcount, 0);
Expand All @@ -530,7 +531,7 @@ int zfcp_adapter_enqueue(struct ccw_device *ccw_device)
if (zfcp_reqlist_alloc(adapter))
goto failed_low_mem_buffers;

if (zfcp_adapter_debug_register(adapter))
if (zfcp_dbf_adapter_register(adapter))
goto debug_register_failed;

if (zfcp_setup_adapter_work_queue(adapter))
Expand Down Expand Up @@ -577,7 +578,7 @@ int zfcp_adapter_enqueue(struct ccw_device *ccw_device)
sysfs_failed:
zfcp_destroy_adapter_work_queue(adapter);
work_queue_failed:
zfcp_adapter_debug_unregister(adapter);
zfcp_dbf_adapter_unregister(adapter->dbf);
debug_register_failed:
dev_set_drvdata(&ccw_device->dev, NULL);
kfree(adapter->req_list);
Expand Down Expand Up @@ -616,7 +617,7 @@ void zfcp_adapter_dequeue(struct zfcp_adapter *adapter)
return;

zfcp_destroy_adapter_work_queue(adapter);
zfcp_adapter_debug_unregister(adapter);
zfcp_dbf_adapter_unregister(adapter->dbf);
zfcp_qdio_free(adapter->qdio);
zfcp_free_low_mem_buffers(adapter);
kfree(adapter->req_list);
Expand Down
Loading

0 comments on commit 5771710

Please sign in to comment.