USB: gadget: f_mass_storage: fsg_add() renamed to fsg_bind_config()

Mass Storage Function had a bit unique name for function
used to add it to USB configuration.  Renamed as to match
naming convention of other functions.

Signed-off-by: Michal Nazarewicz <m.nazarewicz@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

3 files changed, 13 insertions, 6 deletions

diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index 4ce899c9b165..8a95ebc7e3d3 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -2990,9 +2990,9 @@ static struct usb_gadget_strings *fsg_strings_array[] = {
         NULL,
 };
 
-static int fsg_add(struct usb_composite_dev *cdev,
-                   struct usb_configuration *c,
-                   struct fsg_common *common)
+static int fsg_bind_config(struct usb_composite_dev *cdev,
+                           struct usb_configuration *c,
+                           struct fsg_common *common)
 {
         struct fsg_dev *fsg;
         int rc;
@@ -3024,6 +3024,13 @@ static int fsg_add(struct usb_composite_dev *cdev,
         return rc;
 }
 
+static inline int __deprecated __maybe_unused
+fsg_add(struct usb_composite_dev *cdev,
+        struct usb_configuration *c,
+        struct fsg_common *common)
+{
+        return fsg_bind_config(cdev, c, common);
+}
 
 
 /************************* Module parameters *************************/
diff --git a/drivers/usb/gadget/mass_storage.c b/drivers/usb/gadget/mass_storage.c
index e68c00e08765..2b11e2079823 100644
--- a/drivers/usb/gadget/mass_storage.c
+++ b/drivers/usb/gadget/mass_storage.c
@@ -161,7 +161,7 @@ static int __init msg_do_config(struct usb_configuration *c)
         if (IS_ERR(retp))
                 return PTR_ERR(retp);
 
-        ret = fsg_add(c->cdev, c, &common);
+        ret = fsg_bind_config(c->cdev, c, &common);
         fsg_common_put(&common);
         return ret;
 }
diff --git a/drivers/usb/gadget/multi.c b/drivers/usb/gadget/multi.c
index a930d7fd7e7a..d3d314033022 100644
--- a/drivers/usb/gadget/multi.c
+++ b/drivers/usb/gadget/multi.c
@@ -172,7 +172,7 @@ static int __init rndis_do_config(struct usb_configuration *c)
         if (ret < 0)
                 return ret;
 
-        ret = fsg_add(c->cdev, c, fsg_common);
+        ret = fsg_bind_config(c->cdev, c, fsg_common);
         if (ret < 0)
                 return ret;
 
@@ -208,7 +208,7 @@ static int __init cdc_do_config(struct usb_configuration *c)
         if (ret < 0)
                 return ret;
 
-        ret = fsg_add(c->cdev, c, fsg_common);
+        ret = fsg_bind_config(c->cdev, c, fsg_common);
         if (ret < 0)
                 return ret;