Commit 998da497 authored by Andrzej Pietrasiewicz's avatar Andrzej Pietrasiewicz Committed by Felipe Balbi
Browse files

usb: gadget: f_eem: use usb_gstrings_attach 



use the new usb_gstrings_attach interface

Signed-off-by: default avatarAndrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: default avatarKyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
parent c96022de

drivers/usb/gadget/f_eem.c

+6 −11
Original line number Diff line number Diff line
@@ -248,6 +248,7 @@ static int eem_bind(struct usb_configuration *c, struct usb_function *f) 
{

	struct usb_composite_dev *cdev = c->cdev;

	struct f_eem		*eem = func_to_eem(f);

	struct usb_string	*us;

	int			status;

	struct usb_ep		*ep;
@@ -269,16 +270,11 @@ static int eem_bind(struct usb_configuration *c, struct usb_function *f) 
		eem_opts->bound = true;

	}



	/* maybe allocate device-global string IDs */

	if (eem_string_defs[0].id == 0) {



		/* control interface label */

		status = usb_string_id(c->cdev);

		if (status < 0)

			return status;

		eem_string_defs[0].id = status;

		eem_intf.iInterface = status;

	}

	us = usb_gstrings_attach(cdev, eem_strings,

				 ARRAY_SIZE(eem_string_defs));

	if (IS_ERR(us))

		return PTR_ERR(us);

	eem_intf.iInterface = us[0].id;



	/* allocate instance-specific interface IDs */

	status = usb_interface_id(c, f);
@@ -595,7 +591,6 @@ struct usb_function *eem_alloc(struct usb_function_instance *fi) 
	eem->port.cdc_filter = DEFAULT_FILTER;



	eem->port.func.name = "cdc_eem";

	eem->port.func.strings = eem_strings;

	/* descriptors are per-instance copies */

	eem->port.func.bind = eem_bind;

	eem->port.func.unbind = eem_unbind;