提交 1dc90985 编写于 作者: M Michal Nazarewicz 提交者: Greg Kroah-Hartman

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

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: NMichal Nazarewicz <m.nazarewicz@samsung.com>
Signed-off-by: NKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 26eca10e
...@@ -2990,9 +2990,9 @@ static struct usb_gadget_strings *fsg_strings_array[] = { ...@@ -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, ...@@ -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 *************************/
......
...@@ -161,7 +161,7 @@ static int __init msg_do_config(struct usb_configuration *c) ...@@ -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;
} }
......
...@@ -172,7 +172,7 @@ static int __init rndis_do_config(struct usb_configuration *c) ...@@ -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) ...@@ -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;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册