Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-2.6-omap-h63xx.git] / include / scsi / scsi_device.h

diff --git a/include/scsi/scsi_device.h b/include/scsi/scsi_device.h
index ab7acbe809602b94e693da7fac9bc12a8ad47a89..00b78763a1bfa56abf761855a2529f67825c77b9 100644 (file)
--- a/include/scsi/scsi_device.h
+++ b/include/scsi/scsi_device.h
@@ -134,6 +134,7 @@ struct scsi_device {
        unsigned no_start_on_add:1;     /* do not issue start on add */
        unsigned allow_restart:1; /* issue START_UNIT in error handler */
        unsigned manage_start_stop:1;   /* Let HLD (sd) manage start/stop */
+       unsigned start_stop_pwr_cond:1; /* Set power cond. in START_STOP_UNIT */
        unsigned no_uld_attach:1; /* disable connecting to upper level drivers */
        unsigned select_no_atn:1;
        unsigned fix_capacity:1;        /* READ_CAPACITY is too high by 1 */
@@ -156,8 +157,8 @@ struct scsi_device {
 
        int timeout;
 
-       struct device           sdev_gendev;
-       struct class_device     sdev_classdev;
+       struct device           sdev_gendev,
+                               sdev_dev;
 
        struct execute_work     ew; /* used to get process context on put */
 
@@ -167,9 +168,9 @@ struct scsi_device {
 #define        to_scsi_device(d)       \
        container_of(d, struct scsi_device, sdev_gendev)
 #define        class_to_sdev(d)        \
-       container_of(d, struct scsi_device, sdev_classdev)
+       container_of(d, struct scsi_device, sdev_dev)
 #define transport_class_to_sdev(class_dev) \
-       to_scsi_device(class_dev->dev)
+       to_scsi_device(class_dev->parent)
 
 #define sdev_printk(prefix, sdev, fmt, a...)   \
        dev_printk(prefix, &(sdev)->sdev_gendev, fmt, ##a)
@@ -181,7 +182,8 @@ struct scsi_device {
        sdev_printk(prefix, (scmd)->device, fmt, ##a)
 
 enum scsi_target_state {
-       STARGET_RUNNING = 1,
+       STARGET_CREATED = 1,
+       STARGET_RUNNING,
        STARGET_DEL,
 };
 
@@ -220,7 +222,7 @@ static inline struct scsi_target *scsi_target(struct scsi_device *sdev)
        return to_scsi_target(sdev->sdev_gendev.parent);
 }
 #define transport_class_to_starget(class_dev) \
-       to_scsi_target(class_dev->dev)
+       to_scsi_target(class_dev->parent)
 
 #define starget_printk(prefix, starget, fmt, a...)     \
        dev_printk(prefix, &(starget)->dev, fmt, ##a)