aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/usb/storage/usual-tables.c
diff options
context:
space:
mode:
authorSebastian Andrzej Siewior <sebastian@breakpoint.cc>2012-08-28 16:37:13 -0400
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-09-05 20:21:36 -0400
commitf61870ee6f8cc77a844e22f26c58028078df7167 (patch)
treeaa7add2eb8a772803d6a7d787162663521f56f8b /drivers/usb/storage/usual-tables.c
parent68a5059ecf82cc9d52a86fb523584b4d485f1bbe (diff)
usb: remove libusual
The "Low Performance USB Block driver" has been removed which a user of libusual. Now we have only the usb-storage driver as the only driver in tree. This makes libusual needless. This patch removes libusal, fixes up all users. The usual-table is now linked into usb-storage. usb_usual.h remains in public include directory because some staging users seem to need it. Signed-off-by: Sebastian Andrzej Siewior <sebastian@breakpoint.cc> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/storage/usual-tables.c')
-rw-r--r--drivers/usb/storage/usual-tables.c18
1 files changed, 4 insertions, 14 deletions
diff --git a/drivers/usb/storage/usual-tables.c b/drivers/usb/storage/usual-tables.c
index b96927914f89..b78a526910fb 100644
--- a/drivers/usb/storage/usual-tables.c
+++ b/drivers/usb/storage/usual-tables.c
@@ -34,31 +34,23 @@
34 vendorName, productName, useProtocol, useTransport, \ 34 vendorName, productName, useProtocol, useTransport, \
35 initFunction, flags) \ 35 initFunction, flags) \
36{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \ 36{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \
37 .driver_info = (flags)|(USB_US_TYPE_STOR<<24) }
38
39#define COMPLIANT_DEV(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax, \
40 vendorName, productName, useProtocol, useTransport, \
41 initFunction, flags) \
42{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \
43 .driver_info = (flags) } 37 .driver_info = (flags) }
44 38
45#define USUAL_DEV(useProto, useTrans, useType) \ 39#define COMPLIANT_DEV UNUSUAL_DEV
46{ USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, useProto, useTrans), \ 40
47 .driver_info = ((useType)<<24) } 41#define USUAL_DEV(useProto, useTrans) \
42{ USB_INTERFACE_INFO(USB_CLASS_MASS_STORAGE, useProto, useTrans) }
48 43
49struct usb_device_id usb_storage_usb_ids[] = { 44struct usb_device_id usb_storage_usb_ids[] = {
50# include "unusual_devs.h" 45# include "unusual_devs.h"
51 { } /* Terminating entry */ 46 { } /* Terminating entry */
52}; 47};
53EXPORT_SYMBOL_GPL(usb_storage_usb_ids);
54
55MODULE_DEVICE_TABLE(usb, usb_storage_usb_ids); 48MODULE_DEVICE_TABLE(usb, usb_storage_usb_ids);
56 49
57#undef UNUSUAL_DEV 50#undef UNUSUAL_DEV
58#undef COMPLIANT_DEV 51#undef COMPLIANT_DEV
59#undef USUAL_DEV 52#undef USUAL_DEV
60 53
61
62/* 54/*
63 * The table of devices to ignore 55 * The table of devices to ignore
64 */ 56 */
@@ -95,7 +87,6 @@ static struct ignore_entry ignore_ids[] = {
95 87
96#undef UNUSUAL_DEV 88#undef UNUSUAL_DEV
97 89
98
99/* Return an error if a device is in the ignore_ids list */ 90/* Return an error if a device is in the ignore_ids list */
100int usb_usual_ignore_device(struct usb_interface *intf) 91int usb_usual_ignore_device(struct usb_interface *intf)
101{ 92{
@@ -115,4 +106,3 @@ int usb_usual_ignore_device(struct usb_interface *intf)
115 } 106 }
116 return 0; 107 return 0;
117} 108}
118EXPORT_SYMBOL_GPL(usb_usual_ignore_device);