Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Michal Nazarewicz and committed by
Greg Kroah-Hartman
7898aee1 1dc90985

+7 -7
+3 -3
drivers/usb/gadget/f_fs.c
··· 1478 1478 } 1479 1479 1480 1480 1481 - static int functionfs_add(struct usb_composite_dev *cdev, 1482 - struct usb_configuration *c, 1483 - struct ffs_data *ffs) 1481 + static int functionfs_bind_config(struct usb_composite_dev *cdev, 1482 + struct usb_configuration *c, 1483 + struct ffs_data *ffs) 1484 1484 { 1485 1485 struct ffs_function *func; 1486 1486 int ret;
+1 -1
drivers/usb/gadget/g_ffs.c
··· 388 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 392 if (unlikely(ret < 0)) 393 393 return ret; 394 394
+3 -3
include/linux/usb/functionfs.h
··· 180 180 static void functionfs_unbind(struct ffs_data *ffs) 181 181 __attribute__((nonnull)); 182 182 183 - static int functionfs_add(struct usb_composite_dev *cdev, 184 - struct usb_configuration *c, 185 - struct ffs_data *ffs) 183 + static int functionfs_bind_config(struct usb_composite_dev *cdev, 184 + struct usb_configuration *c, 185 + struct ffs_data *ffs) 186 186 __attribute__((warn_unused_result, nonnull)); 187 187 188 188