diff options
Diffstat (limited to 'drivers/usb/storage/usb.h')
-rw-r--r-- | drivers/usb/storage/usb.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/usb/storage/usb.h b/drivers/usb/storage/usb.h index 009fb0953a56..21f3ddbc9080 100644 --- a/drivers/usb/storage/usb.h +++ b/drivers/usb/storage/usb.h | |||
@@ -160,10 +160,10 @@ struct us_data { | |||
160 | }; | 160 | }; |
161 | 161 | ||
162 | /* Convert between us_data and the corresponding Scsi_Host */ | 162 | /* Convert between us_data and the corresponding Scsi_Host */ |
163 | static struct Scsi_Host inline *us_to_host(struct us_data *us) { | 163 | static inline struct Scsi_Host *us_to_host(struct us_data *us) { |
164 | return container_of((void *) us, struct Scsi_Host, hostdata); | 164 | return container_of((void *) us, struct Scsi_Host, hostdata); |
165 | } | 165 | } |
166 | static struct us_data inline *host_to_us(struct Scsi_Host *host) { | 166 | static inline struct us_data *host_to_us(struct Scsi_Host *host) { |
167 | return (struct us_data *) host->hostdata; | 167 | return (struct us_data *) host->hostdata; |
168 | } | 168 | } |
169 | 169 | ||
@@ -176,8 +176,4 @@ extern void fill_inquiry_response(struct us_data *us, | |||
176 | #define scsi_unlock(host) spin_unlock_irq(host->host_lock) | 176 | #define scsi_unlock(host) spin_unlock_irq(host->host_lock) |
177 | #define scsi_lock(host) spin_lock_irq(host->host_lock) | 177 | #define scsi_lock(host) spin_lock_irq(host->host_lock) |
178 | 178 | ||
179 | |||
180 | /* Vendor ID list for devices that require special handling */ | ||
181 | #define USB_VENDOR_ID_GENESYS 0x05e3 /* Genesys Logic */ | ||
182 | |||
183 | #endif | 179 | #endif |