USB: gadget: f_fs: functionfs_add() renamed to functionfs_bind_config()

FunctionFS 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>

diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
index c51c21314076a8f99e6e591ef66662311e3459b3..282b49e336bef4b3d6941d2744594202562b5714 100644 (file)
--- a/drivers/usb/gadget/f_fs.c
+++ b/drivers/usb/gadget/f_fs.c
@@ -1478,9 +1478,9 @@ static void ffs_epfiles_destroy(struct ffs_epfile *epfiles, unsigned count)
 }
 
 
-static int functionfs_add(struct usb_composite_dev *cdev,
-                         struct usb_configuration *c,
-                         struct ffs_data *ffs)
+static int functionfs_bind_config(struct usb_composite_dev *cdev,
+                                 struct usb_configuration *c,
+                                 struct ffs_data *ffs)
 {
        struct ffs_function *func;
        int ret;

diff --git a/drivers/usb/gadget/g_ffs.c b/drivers/usb/gadget/g_ffs.c
index d1af253a910591fabacf1669a66749b5dbc7e1f5..da3a9e403497a95c30408db62943853b5bebbbca 100644 (file)
--- a/drivers/usb/gadget/g_ffs.c
+++ b/drivers/usb/gadget/g_ffs.c
@@ -388,7 +388,7 @@ static int __gfs_do_config(struct usb_configuration *c,
                        return ret;
        }
 
-       ret = functionfs_add(c->cdev, c, gfs_ffs_data);
+       ret = functionfs_bind_config(c->cdev, c, gfs_ffs_data);
        if (unlikely(ret < 0))
                return ret;
 

diff --git a/include/linux/usb/functionfs.h b/include/linux/usb/functionfs.h
index a34a2a043b21dbc1cc5cd83f80f9b345f1fe86a8..6f649c13193b640b3443137db8cb65cbcd89ecd5 100644 (file)
--- a/include/linux/usb/functionfs.h
+++ b/include/linux/usb/functionfs.h
@@ -180,9 +180,9 @@ static int functionfs_bind(struct ffs_data *ffs, struct usb_composite_dev *cdev)
 static void functionfs_unbind(struct ffs_data *ffs)
        __attribute__((nonnull));
 
-static int functionfs_add(struct usb_composite_dev *cdev,
-                         struct usb_configuration *c,
-                         struct ffs_data *ffs)
+static int functionfs_bind_config(struct usb_composite_dev *cdev,
+                                 struct usb_configuration *c,
+                                 struct ffs_data *ffs)
        __attribute__((warn_unused_result, nonnull));