lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[SCSI] zfcp: Remove duplicated code from zfcp_ccw_set_online

Browse Source 
The steps for setting the zfcp_adapter online are the same in
zfcp_ccw_set_online and zfcp_ccw_activate. Remove the code duplication
by calling zfcp_ccw_activate from zfcp_ccw_set_online.

Reviewed-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>
This commit is contained in:
Christof Schmitt
2010-09-08 14:40:00 +02:00
committed by James Bottomley
parent a1ca48319a
commit c9ff5d0315
1 changed files with 1 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/s390/scsi/zfcp_ccw.c
View File

@@ -164,14 +164,7 @@ static int zfcp_ccw_set_online(struct ccw_device *cdev)
BUG_ON(!zfcp_reqlist_isempty(adapter->req_list)); BUG_ON(!zfcp_reqlist_isempty(adapter->req_list));
adapter->req_no = 0; adapter->req_no = 0;
zfcp_erp_modify_adapter_status(adapter, "ccsonl1", NULL, zfcp_ccw_activate(cdev);
ZFCP_STATUS_COMMON_RUNNING, ZFCP_SET);
zfcp_erp_adapter_reopen(adapter, ZFCP_STATUS_COMMON_ERP_FAILED,
"ccsonl2", NULL);
zfcp_erp_wait(adapter);
flush_work(&adapter->scan_work);
zfcp_ccw_adapter_put(adapter); zfcp_ccw_adapter_put(adapter);
return 0; return 0;
} }