Skip to content

Commit

Permalink
USB: gadget: f_mass_storage: fsg_add() renamed to fsg_bind_config()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Michal Nazarewicz authored and Greg Kroah-Hartman committed Aug 10, 2010
1 parent 26eca10 commit 1dc9098
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
13 changes: 10 additions & 3 deletions drivers/usb/gadget/f_mass_storage.c
Original file line number Diff line number Diff line change
Expand Up @@ -2990,9 +2990,9 @@ static struct usb_gadget_strings *fsg_strings_array[] = {
NULL,
};

static int fsg_add(struct usb_composite_dev *cdev,
struct usb_configuration *c,
struct fsg_common *common)
static int fsg_bind_config(struct usb_composite_dev *cdev,
struct usb_configuration *c,
struct fsg_common *common)
{
struct fsg_dev *fsg;
int rc;
Expand Down Expand Up @@ -3024,6 +3024,13 @@ static int fsg_add(struct usb_composite_dev *cdev,
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 *************************/
Expand Down
2 changes: 1 addition & 1 deletion drivers/usb/gadget/mass_storage.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ static int __init msg_do_config(struct usb_configuration *c)
if (IS_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);
return ret;
}
Expand Down
4 changes: 2 additions & 2 deletions drivers/usb/gadget/multi.c
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ static int __init rndis_do_config(struct usb_configuration *c)
if (ret < 0)
return ret;

ret = fsg_add(c->cdev, c, fsg_common);
ret = fsg_bind_config(c->cdev, c, fsg_common);
if (ret < 0)
return ret;

Expand Down Expand Up @@ -208,7 +208,7 @@ static int __init cdc_do_config(struct usb_configuration *c)
if (ret < 0)
return ret;

ret = fsg_add(c->cdev, c, fsg_common);
ret = fsg_bind_config(c->cdev, c, fsg_common);
if (ret < 0)
return ret;

Expand Down

0 comments on commit 1dc9098

Please sign in to comment.