Merge branch 'release' of git://lm-sensors.org/kernel/mhoffman/hwmon-2.6

[linux-2.6] / drivers / usb / storage / usb.h

diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h
index b169132f021b94988c500d90588787d367cb323c..a4ad73bd832df76c0bffc53593c34ac73fabd9d1 100644 (file)
--- a/drivers/usb/storage/usb.h
+++ b/drivers/usb/storage/usb.h
@@ -1,8 +1,6 @@
 /* Driver for USB Mass Storage compliant devices
  * Main Header File
  *
- * $Id: usb.h,v 1.21 2002/04/21 02:57:59 mdharm Exp $
- *
  * Current development and maintenance by:
  *   (c) 1999-2002 Matthew Dharm (mdharm-usb@one-eyed-alien.net)
  *
@@ -72,11 +70,9 @@ struct us_unusual_dev {
 #define US_FLIDX_SG_ACTIVE     1       /* current_sg is in use     */
 #define US_FLIDX_ABORTING      2       /* abort is in progress     */
 #define US_FLIDX_DISCONNECTING 3       /* disconnect in progress   */
-#define ABORTING_OR_DISCONNECTING      ((1UL << US_FLIDX_ABORTING) | \
-                                        (1UL << US_FLIDX_DISCONNECTING))
 #define US_FLIDX_RESETTING     4       /* device reset in progress */
 #define US_FLIDX_TIMED_OUT     5       /* SCSI midlayer timed out  */
-
+#define US_FLIDX_DONT_SCAN     6       /* don't scan (disconnect)  */
 
 #define USB_STOR_STRING_LEN 32
 
@@ -148,7 +144,7 @@ struct us_data {
        struct task_struct      *ctl_thread;     /* the control thread   */
 
        /* mutual exclusion and synchronization structures */
-       struct semaphore        sema;            /* to sleep thread on      */
+       struct completion       cmnd_ready;      /* to sleep thread on      */
        struct completion       notify;          /* thread begin/end        */
        wait_queue_head_t       delay_wait;      /* wait during scan, reset */
        struct completion       scanning_done;   /* wait for scan thread    */