- 2.6.17 port work build breaks, but the patch set is relativly stable

[linux-flexiantxendom0-3.2.10.git] / drivers / usb / storage / usb.c

diff --git a/drivers/usb/storage/usb.c b/drivers/usb/storage/usb.c
index dbcf239..dd10863 100644 (file)
--- a/drivers/usb/storage/usb.c
+++ b/drivers/usb/storage/usb.c
@@ -55,6 +55,7 @@
 #include <linux/init.h>
 #include <linux/slab.h>
 #include <linux/kthread.h>
+#include <linux/mutex.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
@@ -188,7 +189,7 @@ static int storage_suspend(struct usb_interface *iface, pm_message_t message)
        struct us_data *us = usb_get_intfdata(iface);
 
        /* Wait until no command is running */
-       down(&us->dev_semaphore);
+       mutex_lock(&us->dev_mutex);
 
        US_DEBUGP("%s\n", __FUNCTION__);
        if (us->suspend_resume_hook)
@@ -198,7 +199,7 @@ static int storage_suspend(struct usb_interface *iface, pm_message_t message)
        /* When runtime PM is working, we'll set a flag to indicate
         * whether we should autoresume when a SCSI request arrives. */
 
-       up(&us->dev_semaphore);
+       mutex_unlock(&us->dev_mutex);
        return 0;
 }
 
@@ -206,14 +207,14 @@ static int storage_resume(struct usb_interface *iface)
 {
        struct us_data *us = usb_get_intfdata(iface);
 
-       down(&us->dev_semaphore);
+       mutex_lock(&us->dev_mutex);
 
        US_DEBUGP("%s\n", __FUNCTION__);
        if (us->suspend_resume_hook)
                (us->suspend_resume_hook)(us, US_RESUME);
        iface->dev.power.power_state.event = PM_EVENT_ON;
 
-       up(&us->dev_semaphore);
+       mutex_unlock(&us->dev_mutex);
        return 0;
 }
 
@@ -276,12 +277,12 @@ static int usb_stor_control_thread(void * __us)
                US_DEBUGP("*** thread awakened.\n");
 
                /* lock the device pointers */
-               down(&(us->dev_semaphore));
+               mutex_lock(&(us->dev_mutex));
 
                /* if the device has disconnected, we are free to exit */
                if (test_bit(US_FLIDX_DISCONNECTING, &us->flags)) {
                        US_DEBUGP("-- exiting\n");
-                       up(&(us->dev_semaphore));
+                       mutex_unlock(&us->dev_mutex);
                        break;
                }
 
@@ -370,7 +371,7 @@ SkipForAbort:
                scsi_unlock(host);
 
                /* unlock the device pointers */
-               up(&(us->dev_semaphore));
+               mutex_unlock(&us->dev_mutex);
        } /* for (;;) */
 
        scsi_host_put(host);
@@ -815,8 +816,8 @@ static void quiesce_and_remove_host(struct us_data *us)
         * The thread will exit when it sees the DISCONNECTING flag. */
 
        /* Wait for the current command to finish, then remove the host */
-       down(&us->dev_semaphore);
-       up(&us->dev_semaphore);
+       mutex_lock(&us->dev_mutex);
+       mutex_unlock(&us->dev_mutex);
 
        /* queuecommand won't accept any new commands and the control
         * thread won't execute a previously-queued command.  If there
@@ -870,9 +871,9 @@ retry:
                /* For bulk-only devices, determine the max LUN value */
                if (us->protocol == US_PR_BULK &&
                                !(us->flags & US_FL_SINGLE_LUN)) {
-                       down(&us->dev_semaphore);
+                       mutex_lock(&us->dev_mutex);
                        us->max_lun = usb_stor_Bulk_max_lun(us);
-                       up(&us->dev_semaphore);
+                       mutex_unlock(&us->dev_mutex);
                }
                scsi_scan_host(us_to_host(us));
                printk(KERN_DEBUG "usb-storage: device scan complete\n");
@@ -912,7 +913,7 @@ static int storage_probe(struct usb_interface *intf,
 
        us = host_to_us(host);
        memset(us, 0, sizeof(struct us_data));
-       init_MUTEX(&(us->dev_semaphore));
+       mutex_init(&(us->dev_mutex));
        init_MUTEX_LOCKED(&(us->sema));
        init_completion(&(us->notify));
        init_waitqueue_head(&us->delay_wait);