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

Commit 90f79768 authored by Christoph Egger's avatar Christoph Egger Committed by Greg Kroah-Hartman
Browse files

USB: Remove unsupported usb gadget drivers 



A bunch of USB gadget drivers where never ported from the linux 2.4
series to 2.6 kernels. However there's some code still in the tree for
them which isn't used and is probably untested for ages.

As the chance of these drivers being forward ported is probably quite
small now it might be time to get rid of them.

Signed-off-by: default avatarChristoph Egger <siccegge@stud.informatik.uni-erlangen.de>
Cc: Alan Stern <stern@rowland.harvard.edu>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 8e7e61df

drivers/usb/gadget/epautoconf.c

+0 −11
Original line number Diff line number Diff line
@@ -265,17 +265,6 @@ struct usb_ep * __init usb_ep_autoconfig ( 
				return ep;

		}



	} else if (gadget_is_sh (gadget) && USB_ENDPOINT_XFER_INT == type) {

		/* single buffering is enough; maybe 8 byte fifo is too */

		ep = find_ep (gadget, "ep3in-bulk");

		if (ep && ep_matches (gadget, ep, desc))

			return ep;



	} else if (gadget_is_mq11xx (gadget) && USB_ENDPOINT_XFER_INT == type) {

		ep = find_ep (gadget, "ep1-bulk");

		if (ep && ep_matches (gadget, ep, desc))

			return ep;



#ifdef CONFIG_BLACKFIN

	} else if (gadget_is_musbhsfc(gadget) || gadget_is_musbhdrc(gadget)) {

		if ((USB_ENDPOINT_XFER_BULK == type) ||

drivers/usb/gadget/f_acm.c

+0 −8
Original line number Diff line number Diff line
@@ -702,14 +702,6 @@ acm_unbind(struct usb_configuration *c, struct usb_function *f) 
/* Some controllers can't support CDC ACM ... */

static inline bool can_support_cdc(struct usb_configuration *c)

{

	/* SH3 doesn't support multiple interfaces */

	if (gadget_is_sh(c->cdev->gadget))

		return false;



	/* sa1100 doesn't have a third interrupt endpoint */

	if (gadget_is_sa1100(c->cdev->gadget))

		return false;



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

	return true;

}

drivers/usb/gadget/f_ecm.c

+2 −5
Original line number Diff line number Diff line
@@ -497,12 +497,9 @@ static int ecm_set_alt(struct usb_function *f, unsigned intf, unsigned alt) 
			struct net_device	*net;



			/* Enable zlps by default for ECM conformance;

			 * override for musb_hdrc (avoids txdma ovhead)

			 * and sa1100 (can't).

			 * override for musb_hdrc (avoids txdma ovhead).

			 */

			ecm->port.is_zlp_ok = !(

				   gadget_is_sa1100(cdev->gadget)

				|| gadget_is_musbhdrc(cdev->gadget)

			ecm->port.is_zlp_ok = !(gadget_is_musbhdrc(cdev->gadget)

				);

			ecm->port.cdc_filter = DEFAULT_FILTER;

			DBG(cdev, "activate ecm\n");

drivers/usb/gadget/f_mass_storage.c

+2 −6
Original line number Diff line number Diff line
@@ -2776,10 +2776,7 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common, 
	if (cfg->release != 0xffff) {

		i = cfg->release;

	} else {

		/* The sa1100 controller is not supported */

		i = gadget_is_sa1100(gadget)

			? -1

			: usb_gadget_controller_number(gadget);

		i = usb_gadget_controller_number(gadget);

		if (i >= 0) {

			i = 0x0300 + i;

		} else {
@@ -2804,8 +2801,7 @@ static struct fsg_common *fsg_common_init(struct fsg_common *common, 
	 * disable stalls.

	 */

	common->can_stall = cfg->can_stall &&

		!(gadget_is_sh(common->gadget) ||

		  gadget_is_at91(common->gadget));

		!(gadget_is_at91(common->gadget));





	spin_lock_init(&common->lock);

drivers/usb/gadget/f_rndis.c

+0 −4
Original line number Diff line number Diff line
@@ -769,10 +769,6 @@ rndis_unbind(struct usb_configuration *c, struct usb_function *f) 
/* Some controllers can't support RNDIS ... */

static inline bool can_support_rndis(struct usb_configuration *c)

{

	/* only two endpoints on sa1100 */

	if (gadget_is_sa1100(c->cdev->gadget))

		return false;



	/* everything else is *presumably* fine */

	return true;

}