Commit fa06920a authored by Michal Nazarewicz's avatar Michal Nazarewicz Committed by Felipe Balbi
Browse files

usb: gadget: Remove File-backed Storage Gadget (g_file_storage). 



The File-backed Storage Gadget (g_file_storage) gadget has been replaced
with Mass Storage Gadget (g_mass_storage) which uses the composite
framework.  This commit removes g_file_storage (and most references to it).

Signed-off-by: default avatarMichal Nazarewicz <mina86@mina86.com>
Acked-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent 77614e02

Documentation/DocBook/gadget.tmpl

+1 −1
Original line number Original line Diff line number Diff line
@@ -671,7 +671,7 @@ than a kernel driver. 
<para>There's a USB Mass Storage class driver, which provides

<para>There's a USB Mass Storage class driver, which provides

a different solution for interoperability with systems such

a different solution for interoperability with systems such

as MS-Windows and MacOS.

as MS-Windows and MacOS.

That <emphasis>File-backed Storage</emphasis> driver uses a

That <emphasis>Mass Storage</emphasis> driver uses a

file or block device as backing store for a drive,

file or block device as backing store for a drive,

like the <filename>loop</filename> driver.

like the <filename>loop</filename> driver.

The USB host uses the BBB, CB, or CBI versions of the mass

The USB host uses the BBB, CB, or CBI versions of the mass

Documentation/usb/mass-storage.txt

+7 −8
Original line number Original line Diff line number Diff line
@@ -20,9 +20,9 @@ 




  This document describes how to use the gadget from user space, its

  This document describes how to use the gadget from user space, its

  relation to mass storage function (or MSF) and different gadgets

  relation to mass storage function (or MSF) and different gadgets

  using it, and how it differs from File Storage Gadget (or FSG).  It

  using it, and how it differs from File Storage Gadget (or FSG)

  will talk only briefly about how to use MSF within composite

  (which is no longer included in Linux).  It will talk only briefly

  gadgets.

  about how to use MSF within composite gadgets.





* Module parameters

* Module parameters
@@ -198,16 +198,15 @@ 
  The Mass Storage Function and thus the Mass Storage Gadget has been

  The Mass Storage Function and thus the Mass Storage Gadget has been

  based on the File Storage Gadget.  The difference between the two is

  based on the File Storage Gadget.  The difference between the two is

  that MSG is a composite gadget (ie. uses the composite framework)

  that MSG is a composite gadget (ie. uses the composite framework)

  while file storage gadget is a traditional gadget.  From userspace

  while file storage gadget was a traditional gadget.  From userspace

  point of view this distinction does not really matter, but from

  point of view this distinction does not really matter, but from

  kernel hacker's point of view, this means that (i) MSG does not

  kernel hacker's point of view, this means that (i) MSG does not

  duplicate code needed for handling basic USB protocol commands and

  duplicate code needed for handling basic USB protocol commands and

  (ii) MSF can be used in any other composite gadget.

  (ii) MSF can be used in any other composite gadget.





  Because of that, File Storage Gadget has been deprecated and

  Because of that, File Storage Gadget has been removed in Linux 3.8.

  scheduled to be removed in Linux 3.8.  All users need to transition

  All users need to transition to the Mass Storage Gadget.  The two

  to the Mass Storage Gadget by that time.  The two gadgets behave

  gadgets behave mostly the same from the outside except:

  mostly the same from the outside except:





  1. In FSG the “removable” and “cdrom” module parameters set the flag

  1. In FSG the “removable” and “cdrom” module parameters set the flag

     for all logical units whereas in MSG they accept a list of y/n

     for all logical units whereas in MSG they accept a list of y/n

drivers/usb/gadget/Kconfig

+2 −27
Original line number Original line Diff line number Diff line
@@ -721,31 +721,6 @@ config USB_FUNCTIONFS_GENERIC 
	  Include a configuration with the Function Filesystem alone with

	  Include a configuration with the Function Filesystem alone with

	  no Ethernet interface.

	  no Ethernet interface.





config USB_FILE_STORAGE

	tristate "File-backed Storage Gadget (DEPRECATED)"

	depends on BLOCK

	help

	  The File-backed Storage Gadget acts as a USB Mass Storage

	  disk drive.  As its storage repository it can use a regular

	  file or a block device (in much the same way as the "loop"

	  device driver), specified as a module parameter.



	  Say "y" to link the driver statically, or "m" to build a

	  dynamically linked module called "g_file_storage".



	  NOTE: This driver is deprecated.  Its replacement is the

	  Mass Storage Gadget.



config USB_FILE_STORAGE_TEST

	bool "File-backed Storage Gadget testing version"

	depends on USB_FILE_STORAGE

	default n

	help

	  Say "y" to generate the larger testing version of the

	  File-backed Storage Gadget, useful for probing the

	  behavior of USB Mass Storage hosts.  Not needed for

	  normal operation.



config USB_MASS_STORAGE

config USB_MASS_STORAGE

	tristate "Mass Storage Gadget"

	tristate "Mass Storage Gadget"

	depends on BLOCK

	depends on BLOCK
@@ -756,8 +731,8 @@ config USB_MASS_STORAGE 
	  device (in much the same way as the "loop" device driver),

	  device (in much the same way as the "loop" device driver),

	  specified as a module parameter or sysfs option.

	  specified as a module parameter or sysfs option.





	  This driver is an updated replacement for the deprecated

	  This driver is a replacement for now removed File-backed

	  File-backed Storage Gadget (g_file_storage).

	  Storage Gadget (g_file_storage).





	  Say "y" to link the driver statically, or "m" to build

	  Say "y" to link the driver statically, or "m" to build

	  a dynamically linked module called "g_mass_storage".

	  a dynamically linked module called "g_mass_storage".

drivers/usb/gadget/Makefile

+0 −2
Original line number Original line Diff line number Diff line
@@ -44,7 +44,6 @@ g_ether-y := ether.o 
g_serial-y			:= serial.o

g_serial-y			:= serial.o

g_midi-y			:= gmidi.o

g_midi-y			:= gmidi.o

gadgetfs-y			:= inode.o

gadgetfs-y			:= inode.o

g_file_storage-y		:= file_storage.o

g_mass_storage-y		:= mass_storage.o

g_mass_storage-y		:= mass_storage.o

g_printer-y			:= printer.o

g_printer-y			:= printer.o

g_cdc-y				:= cdc2.o

g_cdc-y				:= cdc2.o
@@ -62,7 +61,6 @@ obj-$(CONFIG_USB_AUDIO) += g_audio.o 
obj-$(CONFIG_USB_ETH)		+= g_ether.o

obj-$(CONFIG_USB_ETH)		+= g_ether.o

obj-$(CONFIG_USB_GADGETFS)	+= gadgetfs.o

obj-$(CONFIG_USB_GADGETFS)	+= gadgetfs.o

obj-$(CONFIG_USB_FUNCTIONFS)	+= g_ffs.o

obj-$(CONFIG_USB_FUNCTIONFS)	+= g_ffs.o

obj-$(CONFIG_USB_FILE_STORAGE)	+= g_file_storage.o

obj-$(CONFIG_USB_MASS_STORAGE)	+= g_mass_storage.o

obj-$(CONFIG_USB_MASS_STORAGE)	+= g_mass_storage.o

obj-$(CONFIG_USB_G_SERIAL)	+= g_serial.o

obj-$(CONFIG_USB_G_SERIAL)	+= g_serial.o

obj-$(CONFIG_USB_G_PRINTER)	+= g_printer.o

obj-$(CONFIG_USB_G_PRINTER)	+= g_printer.o

drivers/usb/gadget/file_storage.c

deleted100644 → 0
+0 −3656

File deleted.

Preview size limit exceeded, changes collapsed.