Skip to content

Commit

Permalink
USB: gadget: f_fs: functionfs_add() renamed to functionfs_bind_config()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michal Nazarewicz authored and Greg Kroah-Hartman committed Aug 10, 2010
1 parent 1dc9098 commit 7898aee
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions drivers/usb/gadget/f_fs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/gadget/g_ffs.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
6 changes: 3 additions & 3 deletions include/linux/usb/functionfs.h
Original file line number Diff line number Diff line change
Expand Up @@ -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));


Expand Down

0 comments on commit 7898aee

Please sign in to comment.