summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSwen Schillig <swen@vnet.ibm.com>2009-11-24 16:54:01 +0100
committerJames Bottomley <James.Bottomley@suse.de>2009-12-04 19:02:03 +0100
commitb42aeceb35c59484056b0eea81203a0911ebb50d (patch)
treef3e2cb6eaf976fcfe00be0ef2d71f708710c73f3
parent[SCSI] zfcp: Remove global config_mutex (diff)
downloadlinux-b42aeceb35c59484056b0eea81203a0911ebb50d.tar.xz
linux-b42aeceb35c59484056b0eea81203a0911ebb50d.zip
[SCSI] zfcp: Remove suspend callback
The callback for suspend is not required because it contains exactly the same functionality as the _set_offline routine does. 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>
-rw-r--r--drivers/s390/scsi/zfcp_ccw.c18
1 files changed, 1 insertions, 17 deletions
diff --git a/drivers/s390/scsi/zfcp_ccw.c b/drivers/s390/scsi/zfcp_ccw.c
index 2433eaced20c..ca8dffcd1e02 100644
--- a/drivers/s390/scsi/zfcp_ccw.c
+++ b/drivers/s390/scsi/zfcp_ccw.c
@@ -37,22 +37,6 @@ void zfcp_ccw_adapter_put(struct zfcp_adapter *adapter)
spin_unlock_irqrestore(&zfcp_ccw_adapter_ref_lock, flags);
}
-static int zfcp_ccw_suspend(struct ccw_device *cdev)
-
-{
- struct zfcp_adapter *adapter = zfcp_ccw_adapter_by_cdev(cdev);
-
- if (!adapter)
- return 0;
-
- zfcp_erp_adapter_shutdown(adapter, 0, "ccsusp1", NULL);
- zfcp_erp_wait(adapter);
-
- zfcp_ccw_adapter_put(adapter);
-
- return 0;
-}
-
static int zfcp_ccw_activate(struct ccw_device *cdev)
{
@@ -291,7 +275,7 @@ struct ccw_driver zfcp_ccw_driver = {
.set_offline = zfcp_ccw_set_offline,
.notify = zfcp_ccw_notify,
.shutdown = zfcp_ccw_shutdown,
- .freeze = zfcp_ccw_suspend,
+ .freeze = zfcp_ccw_set_offline,
.thaw = zfcp_ccw_activate,
.restore = zfcp_ccw_activate,
};