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

Commit 736d093b authored Jul 28, 2015 by Robert Baldyga Committed by Felipe Balbi Jul 30, 2015

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>

parent 7a896d40

drivers/usb/gadget/function/f_obex.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -297,7 +297,7 @@ static inline bool can_support_obex(struct usb_configuration *c)
		*
		* Altsettings are mandatory, however...
		*/
		if (!gadget_supports_altsettings(c->cdev->gadget))
		if (!gadget_is_altset_supported(c->cdev->gadget))
		return false;

		/* everything else is probably fine ... */

drivers/usb/gadget/function/u_ether.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -259,7 +259,7 @@ void gether_disconnect(struct gether *);
		/* Some controllers can't support CDC Ethernet (ECM) ... */
		static inline bool can_support_ecm(struct usb_gadget *gadget)
		{
		if (!gadget_supports_altsettings(gadget))
		if (!gadget_is_altset_supported(gadget))
		return false;

		/* Everything else is presumably fine ... but this is a bit

drivers/usb/gadget/legacy/nokia.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -292,7 +292,7 @@ static int nokia_bind(struct usb_composite_dev *cdev)
		nokia_config_500ma_driver.iConfiguration = status;
		nokia_config_100ma_driver.iConfiguration = status;

		if (!gadget_supports_altsettings(gadget)) {
		if (!gadget_is_altset_supported(gadget)) {
		status = -ENODEV;
		goto err_usb;
		}