From 19f67ed9d8ceb2293cb3238b9d8c741293b4adf9 Mon Sep 17 00:00:00 2001
From: Michal Nazarewicz <m.nazarewicz@samsung.com>
Date: Wed, 16 Jun 2010 12:07:58 +0200
Subject: [PATCH] --- yaml --- r: 207978 b: refs/heads/master c:
 7898aee1dacbb246fee958f0a6102320b61768d9 h: refs/heads/master v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/usb/gadget/f_fs.c      | 6 +++---
 trunk/drivers/usb/gadget/g_ffs.c     | 2 +-
 trunk/include/linux/usb/functionfs.h | 6 +++---
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 9abb023d6e41..f66a104688ce 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1dc90985d1b29275607ddac59555199e7894f633
+refs/heads/master: 7898aee1dacbb246fee958f0a6102320b61768d9
diff --git a/trunk/drivers/usb/gadget/f_fs.c b/trunk/drivers/usb/gadget/f_fs.c
index c51c21314076..282b49e336be 100644
--- a/trunk/drivers/usb/gadget/f_fs.c
+++ b/trunk/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/trunk/drivers/usb/gadget/g_ffs.c b/trunk/drivers/usb/gadget/g_ffs.c
index d1af253a9105..da3a9e403497 100644
--- a/trunk/drivers/usb/gadget/g_ffs.c
+++ b/trunk/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/trunk/include/linux/usb/functionfs.h b/trunk/include/linux/usb/functionfs.h
index a34a2a043b21..6f649c13193b 100644
--- a/trunk/include/linux/usb/functionfs.h
+++ b/trunk/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));