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

Commit 1dc90985 authored by Michal Nazarewicz's avatar Michal Nazarewicz Committed by Greg Kroah-Hartman
Browse files

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: 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 26eca10e

drivers/usb/gadget/f_mass_storage.c

+10 −3
Original line number Diff line number Diff line
@@ -2990,7 +2990,7 @@ static struct usb_gadget_strings *fsg_strings_array[] = { 
	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 fsg_common *common)

{
@@ -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 *************************/

drivers/usb/gadget/mass_storage.c

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

}

drivers/usb/gadget/multi.c

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