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

Commit d77adc02 authored by Hans de Goede's avatar Hans de Goede Committed by Sarah Sharp
Browse files

uas: Move uas_find_endpoints to uas-detect.h 



No changes, just the move.

Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
parent d495c1ba

drivers/usb/storage/uas-detect.h

+27 −0
Original line number Diff line number Diff line
@@ -40,6 +40,33 @@ static int uas_find_uas_alt_setting(struct usb_interface *intf) 
	return -ENODEV;

}



static int uas_find_endpoints(struct usb_host_interface *alt,

			      struct usb_host_endpoint *eps[])

{

	struct usb_host_endpoint *endpoint = alt->endpoint;

	unsigned i, n_endpoints = alt->desc.bNumEndpoints;



	for (i = 0; i < n_endpoints; i++) {

		unsigned char *extra = endpoint[i].extra;

		int len = endpoint[i].extralen;

		while (len >= 3) {

			if (extra[1] == USB_DT_PIPE_USAGE) {

				unsigned pipe_id = extra[2];

				if (pipe_id > 0 && pipe_id < 5)

					eps[pipe_id - 1] = &endpoint[i];

				break;

			}

			len -= extra[0];

			extra += extra[0];

		}

	}



	if (!eps[0] || !eps[1] || !eps[2] || !eps[3])

		return -ENODEV;



	return 0;

}



static int uas_use_uas_driver(struct usb_interface *intf,

			      const struct usb_device_id *id)

{

drivers/usb/storage/uas.c

+0 −27
Original line number Diff line number Diff line
@@ -898,33 +898,6 @@ static int uas_switch_interface(struct usb_device *udev, 
			intf->altsetting[0].desc.bInterfaceNumber, alt);

}



static int uas_find_endpoints(struct usb_host_interface *alt,

			      struct usb_host_endpoint *eps[])

{

	struct usb_host_endpoint *endpoint = alt->endpoint;

	unsigned i, n_endpoints = alt->desc.bNumEndpoints;



	for (i = 0; i < n_endpoints; i++) {

		unsigned char *extra = endpoint[i].extra;

		int len = endpoint[i].extralen;

		while (len >= 3) {

			if (extra[1] == USB_DT_PIPE_USAGE) {

				unsigned pipe_id = extra[2];

				if (pipe_id > 0 && pipe_id < 5)

					eps[pipe_id - 1] = &endpoint[i];

				break;

			}

			len -= extra[0];

			extra += extra[0];

		}

	}



	if (!eps[0] || !eps[1] || !eps[2] || !eps[3])

		return -ENODEV;



	return 0;

}



static void uas_configure_endpoints(struct uas_dev_info *devinfo)

{

	struct usb_host_endpoint *eps[4] = { };