xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

USB: gadget: f_mass_storage: fsg_add() renamed to fsg_bind_config()

Browse Source 
Mass Storage Function 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:57 +02:00
committed by Greg Kroah-Hartman
parent 26eca10e6e
commit 1dc90985d1
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/usb/gadget/f_mass_storage.c
View File

@@ -2990,9 +2990,9 @@ static struct usb_gadget_strings *fsg_strings_array[] = {
NULL, NULL,
}; };
static int fsg_add(struct usb_composite_dev *cdev, static int fsg_bind_config(struct usb_composite_dev *cdev,
struct usb_configuration *c, struct usb_configuration *c,
struct fsg_common *common) struct fsg_common *common)
{ {
struct fsg_dev *fsg; struct fsg_dev *fsg;
int rc; int rc;
@@ -3024,6 +3024,13 @@ static int fsg_add(struct usb_composite_dev *cdev,
return rc; return rc;
} }
static inline int __deprecated __maybe_unused
fsg_add(struct usb_composite_dev *cdev,
struct usb_configuration *c,
struct fsg_common *common)
{
return fsg_bind_config(cdev, c, common);
}
/************************* Module parameters *************************/ /************************* Module parameters *************************/

2
drivers/usb/gadget/mass_storage.c
View File

@@ -161,7 +161,7 @@ static int __init msg_do_config(struct usb_configuration *c)
if (IS_ERR(retp)) if (IS_ERR(retp))
return PTR_ERR(retp); return PTR_ERR(retp);
ret = fsg_add(c->cdev, c, &common); ret = fsg_bind_config(c->cdev, c, &common);
fsg_common_put(&common); fsg_common_put(&common);
return ret; return ret;
} }

4
drivers/usb/gadget/multi.c
View File

@@ -172,7 +172,7 @@ static int __init rndis_do_config(struct usb_configuration *c)
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = fsg_add(c->cdev, c, fsg_common); ret = fsg_bind_config(c->cdev, c, fsg_common);
if (ret < 0) if (ret < 0)
return ret; return ret;
@@ -208,7 +208,7 @@ static int __init cdc_do_config(struct usb_configuration *c)
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = fsg_add(c->cdev, c, fsg_common); ret = fsg_bind_config(c->cdev, c, fsg_common);
if (ret < 0) if (ret < 0)
return ret; return ret;