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

Commit 664a51a8 authored by Alan Stern's avatar Alan Stern Committed by Greg Kroah-Hartman
Browse files

USB: deprecate g_file_storage 



This patch (as1471) deprecates the File-backed Storage Driver and
schedules its replacement for the 3.8 kernel release (about two years
from now).  Users are advised to switch to the Mass Storage Gadget
instead.

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 08e6c611

Documentation/feature-removal-schedule.txt

+7 −0
Original line number Diff line number Diff line
@@ -600,3 +600,10 @@ Why: Superseded by the UVCIOC_CTRL_QUERY ioctl. 
Who:	Laurent Pinchart <laurent.pinchart@ideasonboard.com>



----------------------------



What:	g_file_storage driver

When:	3.8

Why:	This driver has been superseded by g_mass_storage.

Who:	Alan Stern <stern@rowland.harvard.edu>



----------------------------

drivers/usb/gadget/Kconfig

+7 −7
Original line number Diff line number Diff line
@@ -877,7 +877,7 @@ config USB_FUNCTIONFS_GENERIC 
	  no Ethernet interface.



config USB_FILE_STORAGE

	tristate "File-backed Storage Gadget"

	tristate "File-backed Storage Gadget (DEPRECATED)"

	depends on BLOCK

	help

	  The File-backed Storage Gadget acts as a USB Mass Storage
@@ -888,6 +888,9 @@ config USB_FILE_STORAGE 
	  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
@@ -907,14 +910,11 @@ config USB_MASS_STORAGE 
	  device (in much the same way as the "loop" device driver),

	  specified as a module parameter or sysfs option.



	  This is heavily based on File-backed Storage Gadget and in most

	  cases you will want to use FSG instead.  This gadget is mostly

	  here to test the functionality of the Mass Storage Function

	  which may be used with composite framework.

	  This driver is an updated replacement for the deprecated

	  File-backed Storage Gadget (g_file_storage).



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

	  a dynamically linked module called "g_mass_storage".  If unsure,

	  consider File-backed Storage Gadget.

	  a dynamically linked module called "g_mass_storage".



config USB_G_SERIAL

	tristate "Serial Gadget (with CDC ACM and CDC OBEX support)"

drivers/usb/gadget/file_storage.c

+2 −0
Original line number Diff line number Diff line
@@ -3486,6 +3486,8 @@ static int __init fsg_bind(struct usb_gadget *gadget) 
	}



	INFO(fsg, DRIVER_DESC ", version: " DRIVER_VERSION "\n");

	INFO(fsg, "NOTE: This driver is deprecated.  "

			"Consider using g_mass_storage instead.\n");

	INFO(fsg, "Number of LUNs=%d\n", fsg->nluns);



	pathbuf = kmalloc(PATH_MAX, GFP_KERNEL);