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: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

1 files changed, 7 insertions, 7 deletions

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 9468adbe42b..22e43fffbcc 100644
--- a/drivers/usb/gadget/Kconfig
+++ b/drivers/usb/gadget/Kconfig
@@ -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)"