Skip to content

Commit f61870e

Browse files
sebastianasgregkh
sebastianas
authored and
gregkh
committed
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>
1 parent 68a5059 commit f61870e

File tree

21 files changed

+42
-350
lines changed

21 files changed

+42
-350
lines changed

‎drivers/staging/keucr/usb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,7 @@ static int get_device_info(struct us_data *us, const struct usb_device_id *id)
320320

321321
us->subclass = idesc->bInterfaceSubClass;
322322
us->protocol = idesc->bInterfaceProtocol;
323-
us->fflags = USB_US_ORIG_FLAGS(id->driver_info);
323+
us->fflags = id->driver_info;
324324
us->Power_IsResum = false;
325325

326326
if (us->fflags & US_FL_IGNORE_DEVICE)

‎drivers/usb/storage/Kconfig

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -213,17 +213,3 @@ config USB_UAS
213213
say 'Y' or 'M' here and the kernel will use the right driver.
214214

215215
If you compile this driver as a module, it will be named uas.
216-
217-
config USB_LIBUSUAL
218-
bool "The shared table of common (or usual) storage devices"
219-
depends on USB
220-
help
221-
This module contains a table of common (or usual) devices
222-
for usb-storage and ub drivers, and allows to switch binding
223-
of these devices without rebuilding modules.
224-
225-
Typical syntax of /etc/modprobe.d/*conf is:
226-
227-
options libusual bias="ub"
228-
229-
If unsure, say N.

‎drivers/usb/storage/Makefile

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,9 @@ obj-$(CONFIG_USB_STORAGE) += usb-storage.o
1212

1313
usb-storage-y := scsiglue.o protocol.o transport.o usb.o
1414
usb-storage-y += initializers.o sierra_ms.o option_ms.o
15-
15+
usb-storage-y += usual-tables.o
1616
usb-storage-$(CONFIG_USB_STORAGE_DEBUG) += debug.o
1717

18-
ifeq ($(CONFIG_USB_LIBUSUAL),)
19-
usb-storage-y += usual-tables.o
20-
else
21-
obj-$(CONFIG_USB) += usb-libusual.o
22-
usb-libusual-y := libusual.o usual-tables.o
23-
endif
24-
2518
obj-$(CONFIG_USB_STORAGE_ALAUDA) += ums-alauda.o
2619
obj-$(CONFIG_USB_STORAGE_CYPRESS_ATACB) += ums-cypress.o
2720
obj-$(CONFIG_USB_STORAGE_DATAFAB) += ums-datafab.o

‎drivers/usb/storage/alauda.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ static int init_alauda(struct us_data *us);
137137
vendorName, productName, useProtocol, useTransport, \
138138
initFunction, flags) \
139139
{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \
140-
.driver_info = (flags)|(USB_US_TYPE_STOR<<24) }
140+
.driver_info = (flags) }
141141

142142
static struct usb_device_id alauda_usb_ids[] = {
143143
# include "unusual_alauda.h"

‎drivers/usb/storage/cypress_atacb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ MODULE_LICENSE("GPL");
4141
vendorName, productName, useProtocol, useTransport, \
4242
initFunction, flags) \
4343
{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \
44-
.driver_info = (flags)|(USB_US_TYPE_STOR<<24) }
44+
.driver_info = (flags) }
4545

4646
static struct usb_device_id cypress_usb_ids[] = {
4747
# include "unusual_cypress.h"

‎drivers/usb/storage/datafab.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ static int datafab_determine_lun(struct us_data *us,
8686
vendorName, productName, useProtocol, useTransport, \
8787
initFunction, flags) \
8888
{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \
89-
.driver_info = (flags)|(USB_US_TYPE_STOR<<24) }
89+
.driver_info = (flags) }
9090

9191
static struct usb_device_id datafab_usb_ids[] = {
9292
# include "unusual_datafab.h"

‎drivers/usb/storage/ene_ub6250.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ MODULE_FIRMWARE(MS_RW_FIRMWARE);
5252
vendorName, productName, useProtocol, useTransport, \
5353
initFunction, flags) \
5454
{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \
55-
.driver_info = (flags)|(USB_US_TYPE_STOR<<24) }
55+
.driver_info = (flags)}
5656

5757
static struct usb_device_id ene_ub6250_usb_ids[] = {
5858
# include "unusual_ene_ub6250.h"

‎drivers/usb/storage/freecom.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ static int init_freecom(struct us_data *us);
117117
vendorName, productName, useProtocol, useTransport, \
118118
initFunction, flags) \
119119
{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \
120-
.driver_info = (flags)|(USB_US_TYPE_STOR<<24) }
120+
.driver_info = (flags) }
121121

122122
static struct usb_device_id freecom_usb_ids[] = {
123123
# include "unusual_freecom.h"

‎drivers/usb/storage/isd200.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ static int isd200_Initialization(struct us_data *us);
7474
vendorName, productName, useProtocol, useTransport, \
7575
initFunction, flags) \
7676
{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \
77-
.driver_info = (flags)|(USB_US_TYPE_STOR<<24) }
77+
.driver_info = (flags) }
7878

7979
static struct usb_device_id isd200_usb_ids[] = {
8080
# include "unusual_isd200.h"
@@ -83,7 +83,6 @@ static struct usb_device_id isd200_usb_ids[] = {
8383
MODULE_DEVICE_TABLE(usb, isd200_usb_ids);
8484

8585
#undef UNUSUAL_DEV
86-
#undef USUAL_DEV
8786

8887
/*
8988
* The flags table
@@ -105,8 +104,6 @@ static struct us_unusual_dev isd200_unusual_dev_list[] = {
105104
};
106105

107106
#undef UNUSUAL_DEV
108-
#undef USUAL_DEV
109-
110107

111108
/* Timeout defines (in Seconds) */
112109

‎drivers/usb/storage/jumpshot.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ MODULE_LICENSE("GPL");
6969
vendorName, productName, useProtocol, useTransport, \
7070
initFunction, flags) \
7171
{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \
72-
.driver_info = (flags)|(USB_US_TYPE_STOR<<24) }
72+
.driver_info = (flags) }
7373

7474
static struct usb_device_id jumpshot_usb_ids[] = {
7575
# include "unusual_jumpshot.h"

‎drivers/usb/storage/karma.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ static int rio_karma_init(struct us_data *us);
5757
vendorName, productName, useProtocol, useTransport, \
5858
initFunction, flags) \
5959
{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \
60-
.driver_info = (flags)|(USB_US_TYPE_STOR<<24) }
60+
.driver_info = (flags) }
6161

6262
static struct usb_device_id karma_usb_ids[] = {
6363
# include "unusual_karma.h"

‎drivers/usb/storage/libusual.c

Lines changed: 0 additions & 243 deletions
This file was deleted.

‎drivers/usb/storage/onetouch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ struct usb_onetouch {
6767
vendorName, productName, useProtocol, useTransport, \
6868
initFunction, flags) \
6969
{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \
70-
.driver_info = (flags)|(USB_US_TYPE_STOR<<24) }
70+
.driver_info = (flags) }
7171

7272
static struct usb_device_id onetouch_usb_ids[] = {
7373
# include "unusual_onetouch.h"

‎drivers/usb/storage/realtek_cr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ static int init_realtek_cr(struct us_data *us);
172172
initFunction, flags) \
173173
{\
174174
USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \
175-
.driver_info = (flags)|(USB_US_TYPE_STOR<<24)\
175+
.driver_info = (flags) \
176176
}
177177

178178
static const struct usb_device_id realtek_cr_ids[] = {

0 commit comments

Comments
 (0)