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

Commit 34c09578 authored by Bart Westgeest's avatar Bart Westgeest Committed by Greg Kroah-Hartman
Browse files

staging: usbip: removed #if 0'd out code 



Signed-off-by: default avatarBart Westgeest <bart@elbrys.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ac2b41ac

drivers/staging/usbip/stub_rx.c

+0 −9
Original line number Diff line number Diff line
@@ -367,15 +367,6 @@ static int get_pipe(struct stub_device *sdev, int epnum, int dir) 
	}



	epd = &ep->desc;

#if 0

	/* epnum 0 is always control */

	if (epnum == 0) {

		if (dir == USBIP_DIR_OUT)

			return usb_sndctrlpipe(udev, 0);

		else

			return usb_rcvctrlpipe(udev, 0);

	}

#endif

	if (usb_endpoint_xfer_control(epd)) {

		if (dir == USBIP_DIR_OUT)

			return usb_sndctrlpipe(udev, epnum);

drivers/staging/usbip/vhci_hcd.c

+0 −39
Original line number Diff line number Diff line
@@ -386,29 +386,6 @@ static int vhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, 
				dum->port_status[rhport] |=

					USB_PORT_STAT_ENABLE;

			}

#if 0

			if (dum->driver) {

				dum->port_status[rhport] |=

					USB_PORT_STAT_ENABLE;

				/* give it the best speed we agree on */

				dum->gadget.speed = dum->driver->speed;

				dum->gadget.ep0->maxpacket = 64;

				switch (dum->gadget.speed) {

				case USB_SPEED_HIGH:

					dum->port_status[rhport] |=

						USB_PORT_STAT_HIGH_SPEED;

					break;

				case USB_SPEED_LOW:

					dum->gadget.ep0->maxpacket = 8;

					dum->port_status[rhport] |=

						USB_PORT_STAT_LOW_SPEED;

					break;

				default:

					dum->gadget.speed = USB_SPEED_FULL;

					break;

				}

			}

#endif

		}

		((u16 *) buf)[0] = cpu_to_le16(dum->port_status[rhport]);

		((u16 *) buf)[1] = cpu_to_le16(dum->port_status[rhport] >> 16);
@@ -425,15 +402,6 @@ static int vhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, 
		case USB_PORT_FEAT_SUSPEND:

			usbip_dbg_vhci_rh(" SetPortFeature: "

					  "USB_PORT_FEAT_SUSPEND\n");

#if 0

			dum->port_status[rhport] |=

				(1 << USB_PORT_FEAT_SUSPEND);

			if (dum->driver->suspend) {

				spin_unlock(&dum->lock);

				dum->driver->suspend(&dum->gadget);

				spin_lock(&dum->lock);

			}

#endif

			break;

		case USB_PORT_FEAT_RESET:

			usbip_dbg_vhci_rh(" SetPortFeature: "
@@ -444,13 +412,6 @@ static int vhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue, 
					~(USB_PORT_STAT_ENABLE |

					  USB_PORT_STAT_LOW_SPEED |

					  USB_PORT_STAT_HIGH_SPEED);

#if 0

				if (dum->driver) {

					dev_dbg(hardware, "disconnect\n");

					stop_activity(dum, dum->driver);

				}

#endif



				/* FIXME test that code path! */

			}

			/* 50msec reset signaling */