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

usb: gadget: apply generic altsetting support check mechanism 

Replace calls of gadget_supports_altsettings() function (which check altset
support by comparing UDC controller name with hardcoded names) with
gadget_is_altset_supported() which checks generic quirk bitfield.

Signed-off-by: Robert Baldyga <r.baldyga@samsung.com>
Signed-off-by: Felipe Balbi <balbi@ti.com>
This commit is contained in:
Robert Baldyga 2015-07-28 07:20:03 +02:00 committed by Felipe Balbi
parent 7a896d4052
commit 736d093b59
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/usb/gadget/function/f_obex.c
View File

@ -297,7 +297,7 @@ static inline bool can_support_obex(struct usb_configuration *c)
* *
* Altsettings are mandatory, however... * Altsettings are mandatory, however...
*/ */
if (!gadget_supports_altsettings(c->cdev->gadget)) if (!gadget_is_altset_supported(c->cdev->gadget))
return false; return false;
/* everything else is *probably* fine ... */ /* everything else is *probably* fine ... */

2
drivers/usb/gadget/function/u_ether.h
View File

@ -259,7 +259,7 @@ void gether_disconnect(struct gether *);
/* Some controllers can't support CDC Ethernet (ECM) ... */ /* Some controllers can't support CDC Ethernet (ECM) ... */
static inline bool can_support_ecm(struct usb_gadget *gadget) static inline bool can_support_ecm(struct usb_gadget *gadget)
{ {
if (!gadget_supports_altsettings(gadget)) if (!gadget_is_altset_supported(gadget))
return false; return false;
/* Everything else is *presumably* fine ... but this is a bit /* Everything else is *presumably* fine ... but this is a bit

2
drivers/usb/gadget/legacy/nokia.c
View File

@ -292,7 +292,7 @@ static int nokia_bind(struct usb_composite_dev *cdev)
nokia_config_500ma_driver.iConfiguration = status; nokia_config_500ma_driver.iConfiguration = status;
nokia_config_100ma_driver.iConfiguration = status; nokia_config_100ma_driver.iConfiguration = status;
if (!gadget_supports_altsettings(gadget)) { if (!gadget_is_altset_supported(gadget)) {
status = -ENODEV; status = -ENODEV;
goto err_usb; goto err_usb;
} }