diff options
author | Michal Nazarewicz <m.nazarewicz@samsung.com> | 2010-06-16 06:07:58 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2010-08-10 17:35:36 -0400 |
commit | 7898aee1dacbb246fee958f0a6102320b61768d9 (patch) | |
tree | 36243fdd64df23ab0112daf95a41c62efd5d5b39 /drivers/usb/gadget | |
parent | 1dc90985d1b29275607ddac59555199e7894f633 (diff) |
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>
Diffstat (limited to 'drivers/usb/gadget')
-rw-r--r-- | drivers/usb/gadget/f_fs.c | 6 | ||||
-rw-r--r-- | drivers/usb/gadget/g_ffs.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/gadget/f_fs.c b/drivers/usb/gadget/f_fs.c index c51c21314076..282b49e336be 100644 --- 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) | |||
1478 | } | 1478 | } |
1479 | 1479 | ||
1480 | 1480 | ||
1481 | static int functionfs_add(struct usb_composite_dev *cdev, | 1481 | static int functionfs_bind_config(struct usb_composite_dev *cdev, |
1482 | struct usb_configuration *c, | 1482 | struct usb_configuration *c, |
1483 | struct ffs_data *ffs) | 1483 | struct ffs_data *ffs) |
1484 | { | 1484 | { |
1485 | struct ffs_function *func; | 1485 | struct ffs_function *func; |
1486 | int ret; | 1486 | int ret; |
diff --git a/drivers/usb/gadget/g_ffs.c b/drivers/usb/gadget/g_ffs.c index d1af253a9105..da3a9e403497 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, | |||
388 | return ret; | 388 | return ret; |
389 | } | 389 | } |
390 | 390 | ||
391 | ret = functionfs_add(c->cdev, c, gfs_ffs_data); | 391 | ret = functionfs_bind_config(c->cdev, c, gfs_ffs_data); |
392 | if (unlikely(ret < 0)) | 392 | if (unlikely(ret < 0)) |
393 | return ret; | 393 | return ret; |
394 | 394 | ||