openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

usb: gadget: f_ecm: use usb_gstrings_attach 

use the new usb_gstrings_attach interface.

Signed-off-by: Andrzej Pietrasiewicz <andrzej.p@samsung.com>
Signed-off-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Andrzej Pietrasiewicz 2013-05-23 10:32:05 +02:00 committed by Felipe Balbi
parent a38a275030
commit 06b72598e8
1 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/usb/gadget/f_ecm.c
View File

@ -686,6 +686,7 @@ ecm_bind(struct usb_configuration *c, struct usb_function *f)
{ {
struct usb_composite_dev *cdev = c->cdev; struct usb_composite_dev *cdev = c->cdev;
struct f_ecm *ecm = func_to_ecm(f); struct f_ecm *ecm = func_to_ecm(f);
struct usb_string *us;
int status; int status;
struct usb_ep *ep; struct usb_ep *ep;
@ -712,16 +713,14 @@ ecm_bind(struct usb_configuration *c, struct usb_function *f)
ecm_opts->bound = true; ecm_opts->bound = true;
} }
#endif #endif
if (ecm_string_defs[0].id == 0) { us = usb_gstrings_attach(cdev, ecm_strings,
status = usb_string_ids_tab(c->cdev, ecm_string_defs); ARRAY_SIZE(ecm_string_defs));
if (status) if (IS_ERR(us))
return status; return PTR_ERR(us);
ecm_control_intf.iInterface = us[0].id;
ecm_control_intf.iInterface = ecm_string_defs[0].id; ecm_data_intf.iInterface = us[2].id;
ecm_data_intf.iInterface = ecm_string_defs[2].id; ecm_desc.iMACAddress = us[1].id;
ecm_desc.iMACAddress = ecm_string_defs[1].id; ecm_iad_descriptor.iFunction = us[3].id;
ecm_iad_descriptor.iFunction = ecm_string_defs[3].id;
}
/* allocate instance-specific interface IDs */ /* allocate instance-specific interface IDs */
status = usb_interface_id(c, f); status = usb_interface_id(c, f);
@ -841,7 +840,6 @@ ecm_old_unbind(struct usb_configuration *c, struct usb_function *f)
DBG(c->cdev, "ecm unbind\n"); DBG(c->cdev, "ecm unbind\n");
ecm_string_defs[0].id = 0;
usb_free_all_descriptors(f); usb_free_all_descriptors(f);
kfree(ecm->notify_req->buf); kfree(ecm->notify_req->buf);
@ -885,7 +883,6 @@ ecm_bind_config(struct usb_configuration *c, u8 ethaddr[ETH_ALEN],
ecm->port.cdc_filter = DEFAULT_FILTER; ecm->port.cdc_filter = DEFAULT_FILTER;
ecm->port.func.name = "cdc_ethernet"; ecm->port.func.name = "cdc_ethernet";
ecm->port.func.strings = ecm_strings;
/* descriptors are per-instance copies */ /* descriptors are per-instance copies */
ecm->port.func.bind = ecm_bind; ecm->port.func.bind = ecm_bind;
ecm->port.func.unbind = ecm_old_unbind; ecm->port.func.unbind = ecm_old_unbind;
@ -944,7 +941,6 @@ static void ecm_unbind(struct usb_configuration *c, struct usb_function *f)
DBG(c->cdev, "ecm unbind\n"); DBG(c->cdev, "ecm unbind\n");
ecm_string_defs[0].id = 0;
usb_free_all_descriptors(f); usb_free_all_descriptors(f);
kfree(ecm->notify_req->buf); kfree(ecm->notify_req->buf);
@ -977,7 +973,6 @@ struct usb_function *ecm_alloc(struct usb_function_instance *fi)
ecm->port.cdc_filter = DEFAULT_FILTER; ecm->port.cdc_filter = DEFAULT_FILTER;
ecm->port.func.name = "cdc_ethernet"; ecm->port.func.name = "cdc_ethernet";
ecm->port.func.strings = ecm_strings;
/* descriptors are per-instance copies */ /* descriptors are per-instance copies */
ecm->port.func.bind = ecm_bind; ecm->port.func.bind = ecm_bind;
ecm->port.func.unbind = ecm_unbind; ecm->port.func.unbind = ecm_unbind;