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

Commit 29cc8897 authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Greg Kroah-Hartman
Browse files

USB: use usb_endpoint_maxp() instead of le16_to_cpu() 



Now ${LINUX}/drivers/usb/* can use usb_endpoint_maxp(desc) to get maximum packet size
instead of le16_to_cpu(desc->wMaxPacketSize).
This patch fix it up

Cc: Armin Fuerst <fuerst@in.tum.de>
Cc: Pavel Machek <pavel@ucw.cz>
Cc: Johannes Erdfelt <johannes@erdfelt.com>
Cc: Vojtech Pavlik <vojtech@suse.cz>
Cc: Oliver Neukum <oliver@neukum.name>
Cc: David Kubicek <dave@awk.cz>
Cc: Johan Hovold <jhovold@gmail.com>
Cc: Brad Hards <bhards@bigpond.net.au>
Acked-by: default avatarFelipe Balbi <balbi@ti.com>
Cc: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Cc: Thomas Dahlmann <dahlmann.thomas@arcor.de>
Cc: David Brownell <david-b@pacbell.net>
Cc: David Lopo <dlopo@chipidea.mips.com>
Cc: Alan Stern <stern@rowland.harvard.edu>
Cc: Michal Nazarewicz <m.nazarewicz@samsung.com>
Cc: Xie Xiaobo <X.Xie@freescale.com>
Cc: Li Yang <leoli@freescale.com>
Cc: Jiang Bo <tanya.jiang@freescale.com>
Cc: Yuan-hsin Chen <yhchen@faraday-tech.com>
Cc: Darius Augulis <augulis.darius@gmail.com>
Cc: Xiaochen Shen <xiaochen.shen@intel.com>
Cc: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Cc: OKI SEMICONDUCTOR, <toshiharu-linux@dsn.okisemi.com>
Cc: Robert Jarzmik <robert.jarzmik@free.fr>
Cc: Ben Dooks <ben@simtec.co.uk>
Cc: Thomas Abraham <thomas.ab@samsung.com>
Cc: Herbert Pötzl <herbert@13thfloor.at>
Cc: Arnaud Patard <arnaud.patard@rtp-net.org>
Cc: Roman Weissgaerber <weissg@vienna.at>
Acked-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: Tony Olech <tony.olech@elandigitalsystems.com>
Cc: Florian Floe Echtler <echtler@fs.tum.de>
Cc: Christian Lucht <lucht@codemercs.com>
Cc: Juergen Stuber <starblue@sourceforge.net>
Cc: Georges Toth <g.toth@e-biz.lu>
Cc: Bill Ryder <bryder@sgi.com>
Cc: Kuba Ober <kuba@mareimbrium.org>
Cc: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 46a57283

drivers/usb/class/cdc-acm.c

+3 −3
Original line number Diff line number Diff line
@@ -1058,11 +1058,11 @@ static int acm_probe(struct usb_interface *intf, 
		goto alloc_fail;

	}



	ctrlsize = le16_to_cpu(epctrl->wMaxPacketSize);

	readsize = le16_to_cpu(epread->wMaxPacketSize) *

	ctrlsize = usb_endpoint_maxp(epctrl);

	readsize = usb_endpoint_maxp(epread) *

				(quirks == SINGLE_RX_URB ? 1 : 2);

	acm->combined_interfaces = combined_interfaces;

	acm->writesize = le16_to_cpu(epwrite->wMaxPacketSize) * 20;

	acm->writesize = usb_endpoint_maxp(epwrite) * 20;

	acm->control = control_interface;

	acm->data = data_interface;

	acm->minor = minor;

drivers/usb/class/cdc-wdm.c

+1 −1
Original line number Diff line number Diff line
@@ -682,7 +682,7 @@ static int wdm_probe(struct usb_interface *intf, const struct usb_device_id *id) 
	if (!ep || !usb_endpoint_is_int_in(ep))

		goto err;



	desc->wMaxPacketSize = le16_to_cpu(ep->wMaxPacketSize);

	desc->wMaxPacketSize = usb_endpoint_maxp(ep);

	desc->bMaxPacketSize0 = udev->descriptor.bMaxPacketSize0;



	desc->orq = kmalloc(sizeof(struct usb_ctrlrequest), GFP_KERNEL);

drivers/usb/class/usbtmc.c

+2 −3
Original line number Diff line number Diff line
@@ -186,8 +186,7 @@ static int usbtmc_ioctl_abort_bulk_in(struct usbtmc_device_data *data) 
	for (n = 0; n < current_setting->desc.bNumEndpoints; n++)

		if (current_setting->endpoint[n].desc.bEndpointAddress ==

			data->bulk_in)

			max_size = le16_to_cpu(current_setting->endpoint[n].

						desc.wMaxPacketSize);

			max_size = usb_endpoint_maxp(&current_setting->endpoint[n].desc);



	if (max_size == 0) {

		dev_err(dev, "Couldn't get wMaxPacketSize\n");
@@ -636,7 +635,7 @@ static int usbtmc_ioctl_clear(struct usbtmc_device_data *data) 
	for (n = 0; n < current_setting->desc.bNumEndpoints; n++) {

		desc = &current_setting->endpoint[n].desc;

		if (desc->bEndpointAddress == data->bulk_in)

			max_size = le16_to_cpu(desc->wMaxPacketSize);

			max_size = usb_endpoint_maxp(desc);

	}



	if (max_size == 0) {

drivers/usb/core/config.c

+4 −4
Original line number Diff line number Diff line
@@ -124,9 +124,9 @@ static void usb_parse_ss_endpoint_companion(struct device *ddev, int cfgno, 


	if (usb_endpoint_xfer_isoc(&ep->desc))

		max_tx = (desc->bMaxBurst + 1) * (desc->bmAttributes + 1) *

			le16_to_cpu(ep->desc.wMaxPacketSize);

			usb_endpoint_maxp(&ep->desc);

	else if (usb_endpoint_xfer_int(&ep->desc))

		max_tx = le16_to_cpu(ep->desc.wMaxPacketSize) *

		max_tx = usb_endpoint_maxp(&ep->desc) *

			(desc->bMaxBurst + 1);

	else

		max_tx = 999999;
@@ -241,7 +241,7 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno, int inum, 
		    cfgno, inum, asnum, d->bEndpointAddress);

		endpoint->desc.bmAttributes = USB_ENDPOINT_XFER_INT;

		endpoint->desc.bInterval = 1;

		if (le16_to_cpu(endpoint->desc.wMaxPacketSize) > 8)

		if (usb_endpoint_maxp(&endpoint->desc) > 8)

			endpoint->desc.wMaxPacketSize = cpu_to_le16(8);

	}
@@ -254,7 +254,7 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno, int inum, 
			&& usb_endpoint_xfer_bulk(d)) {

		unsigned maxp;



		maxp = le16_to_cpu(endpoint->desc.wMaxPacketSize) & 0x07ff;

		maxp = usb_endpoint_maxp(&endpoint->desc) & 0x07ff;

		if (maxp != 512)

			dev_warn(ddev, "config %d interface %d altsetting %d "

				"bulk endpoint 0x%X has invalid maxpacket %d\n",

drivers/usb/core/devices.c

+2 −2
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ static char *usb_dump_endpoint_descriptor(int speed, char *start, char *end, 
	dir = usb_endpoint_dir_in(desc) ? 'I' : 'O';



	if (speed == USB_SPEED_HIGH) {

		switch (le16_to_cpu(desc->wMaxPacketSize) & (0x03 << 11)) {

		switch (usb_endpoint_maxp(desc) & (0x03 << 11)) {

		case 1 << 11:

			bandwidth = 2; break;

		case 2 << 11:
@@ -240,7 +240,7 @@ static char *usb_dump_endpoint_descriptor(int speed, char *start, char *end, 


	start += sprintf(start, format_endpt, desc->bEndpointAddress, dir,

			 desc->bmAttributes, type,

			 (le16_to_cpu(desc->wMaxPacketSize) & 0x07ff) *

			 (usb_endpoint_maxp(desc) & 0x07ff) *

			 bandwidth,

			 interval, unit);

	return start;