diff options
| author | Mike Frysinger <vapier@gentoo.org> | 2012-03-05 13:47:00 +0000 |
|---|---|---|
| committer | Marek Vasut <marek.vasut@gmail.com> | 2012-03-19 00:08:16 +0100 |
| commit | 5b84dd67cfd8c07c4adff935310224a03d0c4d01 (patch) | |
| tree | 4e3299dd7c56e993ec51d0a9364e2d95c0393c74 /common/usb.c | |
| parent | b9743081058d847a9150dc8bd9dd2b74d78105a2 (diff) | |
| download | u-boot-imx-5b84dd67cfd8c07c4adff935310224a03d0c4d01.zip u-boot-imx-5b84dd67cfd8c07c4adff935310224a03d0c4d01.tar.gz u-boot-imx-5b84dd67cfd8c07c4adff935310224a03d0c4d01.tar.bz2 | |
usb: replace wait_ms() with mdelay()
Common code has a mdelay() func, so use that instead of the usb-specific
wait_ms() func. This also fixes the build errors:
ohci-hcd.c: In function 'submit_common_msg':
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1519:9: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1816:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1827:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1844:10: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1563:11: sorry, unimplemented: called from here
/usr/local/src/u-boot/blackfin/include/usb.h:202:44: sorry, unimplemented: inlining failed in call to 'wait_ms': function body not available
ohci-hcd.c:1583:9: sorry, unimplemented: called from here
make[1]: *** [ohci-hcd.o] Error 1
Signed-off-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Marek Vasut <marex@denx.de>
Diffstat (limited to 'common/usb.c')
| -rw-r--r-- | common/usb.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/common/usb.c b/common/usb.c index 3c9ede4..1ec30bc 100644 --- a/common/usb.c +++ b/common/usb.c @@ -81,16 +81,6 @@ char usb_started; /* flag for the started/stopped USB status */ */ static void usb_scan_devices(void); -/*********************************************************************** - * wait_ms - */ - -inline void wait_ms(unsigned long ms) -{ - while (ms-- > 0) - udelay(1000); -} - /*************************************************************************** * Init USB Device */ @@ -209,7 +199,7 @@ int usb_control_msg(struct usb_device *dev, unsigned int pipe, while (timeout--) { if (!((volatile unsigned long)dev->status & USB_ST_NOT_PROC)) break; - wait_ms(1); + mdelay(1); } if (dev->status) return -1; @@ -233,7 +223,7 @@ int usb_bulk_msg(struct usb_device *dev, unsigned int pipe, while (timeout--) { if (!((volatile unsigned long)dev->status & USB_ST_NOT_PROC)) break; - wait_ms(1); + mdelay(1); } *actual_length = dev->act_len; if (dev->status == 0) @@ -897,7 +887,7 @@ int usb_new_device(struct usb_device *dev) return 1; } - wait_ms(10); /* Let the SET_ADDRESS settle */ + mdelay(10); /* Let the SET_ADDRESS settle */ tmp = sizeof(dev->descriptor); |