leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

USB: deprecate g_file_storage

Browse Source 
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: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Alan Stern 2011-06-15 16:31:37 -04:00 committed by Greg Kroah-Hartman
parent 08e6c61112
commit 664a51a81f
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Documentation/feature-removal-schedule.txt
View File

@ -600,3 +600,10 @@ Why: Superseded by the UVCIOC_CTRL_QUERY ioctl.
Who: Laurent Pinchart <laurent.pinchart@ideasonboard.com> 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>
----------------------------

14
drivers/usb/gadget/Kconfig
View File

@ -877,7 +877,7 @@ config USB_FUNCTIONFS_GENERIC
no Ethernet interface. no Ethernet interface.
config USB_FILE_STORAGE config USB_FILE_STORAGE
tristate "File-backed Storage Gadget" tristate "File-backed Storage Gadget (DEPRECATED)"
depends on BLOCK depends on BLOCK
help help
The File-backed Storage Gadget acts as a USB Mass Storage 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 Say "y" to link the driver statically, or "m" to build a
dynamically linked module called "g_file_storage". dynamically linked module called "g_file_storage".
NOTE: This driver is deprecated. Its replacement is the
Mass Storage Gadget.
config USB_FILE_STORAGE_TEST config USB_FILE_STORAGE_TEST
bool "File-backed Storage Gadget testing version" bool "File-backed Storage Gadget testing version"
depends on USB_FILE_STORAGE depends on USB_FILE_STORAGE
@ -907,14 +910,11 @@ 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 is heavily based on File-backed Storage Gadget and in most This driver is an updated replacement for the deprecated
cases you will want to use FSG instead. This gadget is mostly File-backed Storage Gadget (g_file_storage).
here to test the functionality of the Mass Storage Function
which may be used with composite framework.
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". If unsure, a dynamically linked module called "g_mass_storage".
consider File-backed Storage Gadget.
config USB_G_SERIAL config USB_G_SERIAL
tristate "Serial Gadget (with CDC ACM and CDC OBEX support)" tristate "Serial Gadget (with CDC ACM and CDC OBEX support)"

2
drivers/usb/gadget/file_storage.c
View File

@ -3486,6 +3486,8 @@ static int __init fsg_bind(struct usb_gadget *gadget)
} }
INFO(fsg, DRIVER_DESC ", version: " DRIVER_VERSION "\n"); 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); INFO(fsg, "Number of LUNs=%d\n", fsg->nluns);
pathbuf = kmalloc(PATH_MAX, GFP_KERNEL); pathbuf = kmalloc(PATH_MAX, GFP_KERNEL);