mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Michal Nazarewicz <m.nazarewicz@samsung.com>
To: linux-usb@vger.kernel.org
Cc: David Brownell <dbrownell@users.sourceforge.net>,
	Kyungmin Park <kyungmin.park@samsung.com>,
	Marek Szyprowski <m.szyprowski@samsung.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCHv3 03/11] USB: gadget: f_fs: functionfs_add() renamed to functionfs_bind_config()
Date: Wed, 02 Jun 2010 14:45:24 +0200	[thread overview]
Message-ID: <785f09f63fe30ba52ce15fd7cb3f5750aa279ab9.1275481997.git.mina86@mina86.com> (raw)
In-Reply-To: <e4cb4e647e0ebc51956d6581cd930e3d32f29b99.1275481997.git.mina86@mina86.com>

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>
---
 drivers/usb/gadget/f_fs.c      |    6 +++---
 drivers/usb/gadget/g_ffs.c     |    2 +-
 include/linux/usb/functionfs.h |    6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c
index d69eccf..3fe120f 100644
--- a/drivers/usb/gadget/f_fs.c
+++ b/drivers/usb/gadget/f_fs.c
@@ -1480,9 +1480,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 4b0e4a0..2f26470 100644
--- 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 a34a2a0..6f649c1 100644
--- 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));
 
 
-- 
1.7.1


  reply	other threads:[~2010-06-02 12:46 UTC|newest]

Thread overview: 21+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-06-02 12:45 [PATCHv3 00/11] USB improvements and cleanpus, g_multi install mode Michal Nazarewicz
2010-06-02 12:45 ` [PATCHv3 01/11] USB: gadget: g_mass_storage: static data instead of dynamic allocation Michal Nazarewicz
2010-06-02 12:45   ` [PATCHv3 02/11] USB: gadget: f_mass_storage: fsg_add() renamed to fsg_bind_config() Michal Nazarewicz
2010-06-02 12:45     ` Michal Nazarewicz [this message]
2010-06-02 12:45       ` [PATCHv3 04/11] USB: gadget: composite: usb_string_ids_*() functions added Michal Nazarewicz
2010-06-02 12:45         ` [PATCHv3 05/11] USB: gadget: f_fs: use usb_string_ids_n() Michal Nazarewicz
2010-06-02 12:45           ` [PATCHv3 06/11] USB: gadget: g_multi: code clean up and refactoring Michal Nazarewicz
2010-06-02 12:45             ` [PATCHv3 07/11] USB: gadget: g_multi: added documentation and INF files Michal Nazarewicz
2010-06-02 12:45               ` [PATCHv3 08/11] USB: gadget: g_multi: more configurable Michal Nazarewicz
2010-06-02 12:45                 ` [PATCHv3 09/11] USB: gadget: composite: addad disconnect callback Michal Nazarewicz
2010-06-02 12:45                   ` [PATCHv3 10/11] USB: gadget: f_mass_storage: added eject callback Michal Nazarewicz
2010-06-02 12:45                     ` [PATCHv3 11/11] USB: gadget: g_multi: Install Mode added Michal Nazarewicz
2010-06-02 13:02               ` [PATCHv3 07/11] USB: gadget: g_multi: added documentation and INF files Xiaofan Chen
2010-06-02 13:15                 ` Xiaofan Chen
2010-06-02 13:22                 ` Michał Nazarewicz
2010-06-02 15:46                 ` Michał Nazarewicz
2010-06-03  5:03                   ` Xiaofan Chen
2010-06-03  5:16                     ` Xiaofan Chen
2010-06-03  9:02                       ` Michal Nazarewicz
2010-06-03 10:32                         ` Xiaofan Chen
2010-06-02 13:38               ` Xiaofan Chen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=785f09f63fe30ba52ce15fd7cb3f5750aa279ab9.1275481997.git.mina86@mina86.com \
    --to=m.nazarewicz@samsung.com \
    --cc=dbrownell@users.sourceforge.net \
    --cc=kyungmin.park@samsung.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=m.szyprowski@samsung.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®