diff options
author | Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2011-08-23 06:12:03 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-08-23 12:47:40 -0400 |
commit | 29cc88979a8818cd8c5019426e945aed118b400e (patch) | |
tree | 849401ad869d09ce45dd7a3fadd7eb71b1e9fcbd /drivers/usb/core/config.c | |
parent | 46a57283e86c68351377ac3349f1465aee938fbd (diff) |
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: Felipe 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: Sarah 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: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/usb/core/config.c')
-rw-r--r-- | drivers/usb/core/config.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c index 26678cadfb21..9d5e07af55be 100644 --- a/drivers/usb/core/config.c +++ b/drivers/usb/core/config.c | |||
@@ -124,9 +124,9 @@ static void usb_parse_ss_endpoint_companion(struct device *ddev, int cfgno, | |||
124 | 124 | ||
125 | if (usb_endpoint_xfer_isoc(&ep->desc)) | 125 | if (usb_endpoint_xfer_isoc(&ep->desc)) |
126 | max_tx = (desc->bMaxBurst + 1) * (desc->bmAttributes + 1) * | 126 | max_tx = (desc->bMaxBurst + 1) * (desc->bmAttributes + 1) * |
127 | le16_to_cpu(ep->desc.wMaxPacketSize); | 127 | usb_endpoint_maxp(&ep->desc); |
128 | else if (usb_endpoint_xfer_int(&ep->desc)) | 128 | else if (usb_endpoint_xfer_int(&ep->desc)) |
129 | max_tx = le16_to_cpu(ep->desc.wMaxPacketSize) * | 129 | max_tx = usb_endpoint_maxp(&ep->desc) * |
130 | (desc->bMaxBurst + 1); | 130 | (desc->bMaxBurst + 1); |
131 | else | 131 | else |
132 | max_tx = 999999; | 132 | max_tx = 999999; |
@@ -241,7 +241,7 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno, int inum, | |||
241 | cfgno, inum, asnum, d->bEndpointAddress); | 241 | cfgno, inum, asnum, d->bEndpointAddress); |
242 | endpoint->desc.bmAttributes = USB_ENDPOINT_XFER_INT; | 242 | endpoint->desc.bmAttributes = USB_ENDPOINT_XFER_INT; |
243 | endpoint->desc.bInterval = 1; | 243 | endpoint->desc.bInterval = 1; |
244 | if (le16_to_cpu(endpoint->desc.wMaxPacketSize) > 8) | 244 | if (usb_endpoint_maxp(&endpoint->desc) > 8) |
245 | endpoint->desc.wMaxPacketSize = cpu_to_le16(8); | 245 | endpoint->desc.wMaxPacketSize = cpu_to_le16(8); |
246 | } | 246 | } |
247 | 247 | ||
@@ -254,7 +254,7 @@ static int usb_parse_endpoint(struct device *ddev, int cfgno, int inum, | |||
254 | && usb_endpoint_xfer_bulk(d)) { | 254 | && usb_endpoint_xfer_bulk(d)) { |
255 | unsigned maxp; | 255 | unsigned maxp; |
256 | 256 | ||
257 | maxp = le16_to_cpu(endpoint->desc.wMaxPacketSize) & 0x07ff; | 257 | maxp = usb_endpoint_maxp(&endpoint->desc) & 0x07ff; |
258 | if (maxp != 512) | 258 | if (maxp != 512) |
259 | dev_warn(ddev, "config %d interface %d altsetting %d " | 259 | dev_warn(ddev, "config %d interface %d altsetting %d " |
260 | "bulk endpoint 0x%X has invalid maxpacket %d\n", | 260 | "bulk endpoint 0x%X has invalid maxpacket %d\n", |