diff options
author | Arjan van de Ven <arjan@infradead.org> | 2006-01-11 09:55:29 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2006-03-20 17:49:55 -0500 |
commit | 4186ecf8ad16dd05759a09594de6a87e48759ba6 (patch) | |
tree | 3ee5292d9f4a36e3eb359b586289ec972bcbaf39 /drivers/usb/storage/usb.h | |
parent | 35cce732d9d4d9af6b4ad4d26d8f8c0eddb573a2 (diff) |
[PATCH] USB: convert a bunch of USB semaphores to mutexes
the patch below converts a bunch of semaphores-used-as-mutex in the USB
code to mutexes
Signed-off-by: Arjan van de Ven <arjan@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/storage/usb.h')
-rw-r--r-- | drivers/usb/storage/usb.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h index 7259fd1f6b0d..009fb0953a56 100644 --- a/drivers/usb/storage/usb.h +++ b/drivers/usb/storage/usb.h | |||
@@ -49,6 +49,7 @@ | |||
49 | #include <linux/blkdev.h> | 49 | #include <linux/blkdev.h> |
50 | #include <linux/smp_lock.h> | 50 | #include <linux/smp_lock.h> |
51 | #include <linux/completion.h> | 51 | #include <linux/completion.h> |
52 | #include <linux/mutex.h> | ||
52 | #include <scsi/scsi_host.h> | 53 | #include <scsi/scsi_host.h> |
53 | 54 | ||
54 | struct us_data; | 55 | struct us_data; |
@@ -103,9 +104,9 @@ typedef void (*pm_hook)(struct us_data *, int); /* power management hook */ | |||
103 | struct us_data { | 104 | struct us_data { |
104 | /* The device we're working with | 105 | /* The device we're working with |
105 | * It's important to note: | 106 | * It's important to note: |
106 | * (o) you must hold dev_semaphore to change pusb_dev | 107 | * (o) you must hold dev_mutex to change pusb_dev |
107 | */ | 108 | */ |
108 | struct semaphore dev_semaphore; /* protect pusb_dev */ | 109 | struct mutex dev_mutex; /* protect pusb_dev */ |
109 | struct usb_device *pusb_dev; /* this usb_device */ | 110 | struct usb_device *pusb_dev; /* this usb_device */ |
110 | struct usb_interface *pusb_intf; /* this interface */ | 111 | struct usb_interface *pusb_intf; /* this interface */ |
111 | struct us_unusual_dev *unusual_dev; /* device-filter entry */ | 112 | struct us_unusual_dev *unusual_dev; /* device-filter entry */ |