Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f61870ee authored by Sebastian Andrzej Siewior's avatar Sebastian Andrzej Siewior Committed by Greg Kroah-Hartman
Browse files

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: default avatarSebastian Andrzej Siewior <sebastian@breakpoint.cc>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 68a5059e

drivers/staging/keucr/usb.c

+1 −1
Original line number Diff line number Diff line
@@ -320,7 +320,7 @@ static int get_device_info(struct us_data *us, const struct usb_device_id *id) 


	us->subclass = idesc->bInterfaceSubClass;

	us->protocol = idesc->bInterfaceProtocol;

	us->fflags = USB_US_ORIG_FLAGS(id->driver_info);

	us->fflags = id->driver_info;

	us->Power_IsResum = false;



	if (us->fflags & US_FL_IGNORE_DEVICE)

drivers/usb/storage/Kconfig

+0 −14
Original line number Diff line number Diff line
@@ -213,17 +213,3 @@ config USB_UAS 
	  say 'Y' or 'M' here and the kernel will use the right driver.



	  If you compile this driver as a module, it will be named uas.
 


config USB_LIBUSUAL

	bool "The shared table of common (or usual) storage devices"

	depends on USB

	help

	  This module contains a table of common (or usual) devices

	  for usb-storage and ub drivers, and allows to switch binding

	  of these devices without rebuilding modules.



	  Typical syntax of /etc/modprobe.d/*conf is:



		options libusual bias="ub"



	  If unsure, say N.

drivers/usb/storage/Makefile

+1 −8
Original line number Diff line number Diff line
@@ -12,15 +12,8 @@ obj-$(CONFIG_USB_STORAGE) += usb-storage.o 


usb-storage-y := scsiglue.o protocol.o transport.o usb.o

usb-storage-y += initializers.o sierra_ms.o option_ms.o



usb-storage-$(CONFIG_USB_STORAGE_DEBUG) += debug.o



ifeq ($(CONFIG_USB_LIBUSUAL),)

usb-storage-y += usual-tables.o

else

	obj-$(CONFIG_USB)	+= usb-libusual.o

	usb-libusual-y		:= libusual.o usual-tables.o

endif

usb-storage-$(CONFIG_USB_STORAGE_DEBUG) += debug.o



obj-$(CONFIG_USB_STORAGE_ALAUDA)	+= ums-alauda.o

obj-$(CONFIG_USB_STORAGE_CYPRESS_ATACB) += ums-cypress.o

drivers/usb/storage/alauda.c

+1 −1
Original line number Diff line number Diff line
@@ -137,7 +137,7 @@ static int init_alauda(struct us_data *us); 
		    vendorName, productName, useProtocol, useTransport, \

		    initFunction, flags) \

{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \

  .driver_info = (flags)|(USB_US_TYPE_STOR<<24) }

  .driver_info = (flags) }



static struct usb_device_id alauda_usb_ids[] = {

#	include "unusual_alauda.h"

drivers/usb/storage/cypress_atacb.c

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ MODULE_LICENSE("GPL"); 
		    vendorName, productName, useProtocol, useTransport, \

		    initFunction, flags) \

{ USB_DEVICE_VER(id_vendor, id_product, bcdDeviceMin, bcdDeviceMax), \

  .driver_info = (flags)|(USB_US_TYPE_STOR<<24) }

  .driver_info = (flags) }



static struct usb_device_id cypress_usb_ids[] = {

#	include "unusual_cypress.h"