summaryrefslogtreecommitdiffstats
path: root/drivers/scsi/scsi_priv.h
diff options
context:
space:
mode:
authorAlan Stern2010-06-17 16:36:49 +0200
committerJames Bottomley2010-07-28 16:07:49 +0200
commitdb5bd1e0b505c54ff492172ce4abc245cf6cd639 (patch)
treeb0b4c42c45b52ce9f1f4727a144475071a3f0ac3 /drivers/scsi/scsi_priv.h
parent[SCSI] Unify SAM_ and SAM_STAT_ macros (diff)
downloadkernel-qcow2-linux-db5bd1e0b505c54ff492172ce4abc245cf6cd639.tar.gz
kernel-qcow2-linux-db5bd1e0b505c54ff492172ce4abc245cf6cd639.tar.xz
kernel-qcow2-linux-db5bd1e0b505c54ff492172ce4abc245cf6cd639.zip
[SCSI] convert to the new PM framework
This patch (as1397b) converts the SCSI midlayer to use the new PM callbacks (struct dev_pm_ops). A new source file, scsi_pm.c, is created to hold the new callback routines, and the existing suspend/resume code is moved there. Signed-off-by: Alan Stern <stern@rowland.harvard.edu> Signed-off-by: James Bottomley <James.Bottomley@suse.de>
Diffstat (limited to 'drivers/scsi/scsi_priv.h')
-rw-r--r--drivers/scsi/scsi_priv.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/scsi/scsi_priv.h b/drivers/scsi/scsi_priv.h
index 1fbf7c78bba0..dddacc732550 100644
--- a/drivers/scsi/scsi_priv.h
+++ b/drivers/scsi/scsi_priv.h
@@ -144,6 +144,13 @@ static inline void scsi_netlink_init(void) {}
static inline void scsi_netlink_exit(void) {}
#endif
+/* scsi_pm.c */
+#ifdef CONFIG_PM_OPS
+extern const struct dev_pm_ops scsi_bus_pm_ops;
+#else
+#define scsi_bus_pm_ops (*NULL)
+#endif
+
/*
* internal scsi timeout functions: for use by mid-layer and transport
* classes.