[SCSI] zfcp: Remove duplicated code from zfcp_ccw_set_online
Christof Schmitt [Wed, 8 Sep 2010 12:40:00 +0000 (14:40 +0200)]
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>

drivers/s390/scsi/zfcp_ccw.c

index ce1cc7a..bdf2f38 100644 (file)
@@ -164,14 +164,7 @@ static int zfcp_ccw_set_online(struct ccw_device *cdev)
        BUG_ON(!zfcp_reqlist_isempty(adapter->req_list));
        adapter->req_no = 0;
 
-       zfcp_erp_modify_adapter_status(adapter, "ccsonl1", NULL,
-                                      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_activate(cdev);
        zfcp_ccw_adapter_put(adapter);
        return 0;
 }