diff options
| author | Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> | 2014-07-26 17:24:42 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-07-28 07:31:18 +0200 |
| commit | 343ccff163789949f2c683dcea819ceb68dbcf02 (patch) | |
| tree | 48f39c1ccb0365abefb39a4a55ea5713abe6bc08 /drivers/usb/host/ehci-hcd.c | |
| parent | 418add62c1391ae9195ec1c145906332732dc93c (diff) | |
| download | barebox-343ccff163789949f2c683dcea819ceb68dbcf02.tar.gz barebox-343ccff163789949f2c683dcea819ceb68dbcf02.tar.xz | |
USB: EHCI: use min3 from Linux
EHCI HCD has a private version of min3() determining the smallest
number out of 3. We already have min()/max() imported from Linux,
also get min3()/max3() and use it instead of EHCI's private one.
Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/usb/host/ehci-hcd.c')
| -rw-r--r-- | drivers/usb/host/ehci-hcd.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index a76e06bd56..c0ea8d013a 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -436,16 +436,6 @@ fail: return -1; } -static inline int min3(int a, int b, int c) -{ - - if (b < a) - a = b; - if (c < a) - a = c; - return a; -} - #ifdef CONFIG_MACH_EFIKA_MX_SMARTBOOK #include <usb/ulpi.h> /* @@ -717,7 +707,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer, } wait_ms(1); - len = min3(srclen, le16_to_cpu(req->length), length); + len = min3(srclen, (int)le16_to_cpu(req->length), length); if (srcptr != NULL && len > 0) memcpy(buffer, srcptr, len); else |