Merge git://git.infradead.org/battery-2.6

[linux.git] / include / scsi / scsi_transport_spi.h

diff --git a/include/scsi/scsi_transport_spi.h b/include/scsi/scsi_transport_spi.h
index 5e1d61913d4ef38f1f800607eb0a000fa71e959a..286e9628ed8ba077f997e4105f6954e10d0d6c13 100644 (file)
--- a/include/scsi/scsi_transport_spi.h
+++ b/include/scsi/scsi_transport_spi.h
@@ -20,7 +20,6 @@
 #ifndef SCSI_TRANSPORT_SPI_H
 #define SCSI_TRANSPORT_SPI_H
 
 #ifndef SCSI_TRANSPORT_SPI_H
 #define SCSI_TRANSPORT_SPI_H
 

-#include <linux/config.h>

 #include <linux/transport_class.h>
 #include <linux/mutex.h>
 
 #include <linux/transport_class.h>
 #include <linux/mutex.h>
 


@@ -54,7 +53,8 @@ struct spi_transport_attrs {
        unsigned int support_ius; /* support Information Units */
        unsigned int support_qas; /* supports quick arbitration and selection */
        /* Private Fields */
        unsigned int support_ius; /* support Information Units */
        unsigned int support_qas; /* supports quick arbitration and selection */
        /* Private Fields */

-       unsigned int dv_pending:1; /* Internal flag */
+       unsigned int dv_pending:1; /* Internal flag: DV Requested */
+       unsigned int dv_in_progress:1;  /* Internal: DV started */

        struct mutex dv_mutex; /* semaphore to serialise dv */
 };
 
        struct mutex dv_mutex; /* semaphore to serialise dv */
 };
 


@@ -85,6 +85,7 @@ struct spi_host_attrs {
 #define spi_pcomp_en(x)        (((struct spi_transport_attrs *)&(x)->starget_data)->pcomp_en)
 #define spi_hold_mcs(x)        (((struct spi_transport_attrs *)&(x)->starget_data)->hold_mcs)
 #define spi_initial_dv(x)      (((struct spi_transport_attrs *)&(x)->starget_data)->initial_dv)
 #define spi_pcomp_en(x)        (((struct spi_transport_attrs *)&(x)->starget_data)->pcomp_en)
 #define spi_hold_mcs(x)        (((struct spi_transport_attrs *)&(x)->starget_data)->hold_mcs)
 #define spi_initial_dv(x)      (((struct spi_transport_attrs *)&(x)->starget_data)->initial_dv)

+#define spi_dv_pending(x) (((struct spi_transport_attrs *)&(x)->starget_data)->dv_pending)

 
 #define spi_support_sync(x)    (((struct spi_transport_attrs *)&(x)->starget_data)->support_sync)
 #define spi_support_wide(x)    (((struct spi_transport_attrs *)&(x)->starget_data)->support_wide)
 
 #define spi_support_sync(x)    (((struct spi_transport_attrs *)&(x)->starget_data)->support_sync)
 #define spi_support_wide(x)    (((struct spi_transport_attrs *)&(x)->starget_data)->support_wide)