evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
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>
This commit is contained in:
Michal Nazarewicz 2010-06-16 12:07:58 +02:00 • committed by Greg Kroah-Hartman
parent 1dc90985d1
commit 7898aee1da
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
drivers/usb/gadget/f_fs.c
View file

@ -1478,9 +1478,9 @@ static void ffs_epfiles_destroy(struct ffs_epfile *epfiles, unsigned count)
} }
static int functionfs_add(struct usb_composite_dev *cdev, static int functionfs_bind_config(struct usb_composite_dev *cdev,
struct usb_configuration *c, struct usb_configuration *c,
struct ffs_data *ffs) struct ffs_data *ffs)
{ {
struct ffs_function *func; struct ffs_function *func;
int ret; int ret;

2
drivers/usb/gadget/g_ffs.c
View file

@ -388,7 +388,7 @@ static int __gfs_do_config(struct usb_configuration *c,
return ret; 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)) if (unlikely(ret < 0))
return ret; return ret;

6
include/linux/usb/functionfs.h
View file

@ -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) static void functionfs_unbind(struct ffs_data *ffs)
__attribute__((nonnull)); __attribute__((nonnull));
static int functionfs_add(struct usb_composite_dev *cdev, static int functionfs_bind_config(struct usb_composite_dev *cdev,
struct usb_configuration *c, struct usb_configuration *c,
struct ffs_data *ffs) struct ffs_data *ffs)
__attribute__((warn_unused_result, nonnull)); __attribute__((warn_unused_result, nonnull));