Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7898aee1 authored by Michal Nazarewicz's avatar Michal Nazarewicz Committed by Greg Kroah-Hartman
Browse files

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: default avatarMichal Nazarewicz <m.nazarewicz@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 1dc90985

drivers/usb/gadget/f_fs.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1478,7 +1478,7 @@ 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)

{

{

drivers/usb/gadget/g_ffs.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -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;

include/linux/usb/functionfs.h

+3 −3
Original line number Original line Diff line number Diff line
@@ -180,7 +180,7 @@ 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));