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>

diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt
index 1a9446b59153d8e4dd9f2bc787714a8179eb5bb4..21f331d0473de834df8b8f0b196f1cad8ec31bf5 100644 (file)
--- a/Documentation/feature-removal-schedule.txt
+++ b/Documentation/feature-removal-schedule.txt
@@ -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>
+
+----------------------------

diff --git a/drivers/usb/gadget/Kconfig b/drivers/usb/gadget/Kconfig
index 9468adbe42bbda9e61c325208bb5f67712aef925..22e43fffbcc0a0ba4619e8a7f8f9dac98b4e8622 100644 (file)
--- 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)"

diff --git a/drivers/usb/gadget/file_storage.c b/drivers/usb/gadget/file_storage.c
index 0360f56221ea21ed3eda1fc93cfde2ecd76bc08c..83bee30cdb9439d4a92c4af7d61a3ff9b34a2610 100644 (file)
--- a/drivers/usb/gadget/file_storage.c
+++ b/drivers/usb/gadget/file_storage.c
@@ -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);