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 /drivers/usb/host/ehci-hcd.c | |
| parent | b9743081058d847a9150dc8bd9dd2b74d78105a2 (diff) | |
| download | olio-uboot-2014.01-5b84dd67cfd8c07c4adff935310224a03d0c4d01.tar.xz olio-uboot-2014.01-5b84dd67cfd8c07c4adff935310224a03d0c4d01.zip | |
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 'drivers/usb/host/ehci-hcd.c')
| -rw-r--r-- | drivers/usb/host/ehci-hcd.c | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c index d6fee814c..ef5afc22b 100644 --- a/drivers/usb/host/ehci-hcd.c +++ b/drivers/usb/host/ehci-hcd.c @@ -776,7 +776,7 @@ ehci_submit_root(struct usb_device *dev, unsigned long pipe, void *buffer,  		goto unknown;  	} -	wait_ms(1); +	mdelay(1);  	len = min3(srclen, le16_to_cpu(req->length), length);  	if (srcptr != NULL && len > 0)  		memcpy(buffer, srcptr, len); @@ -857,7 +857,7 @@ int usb_lowlevel_init(void)  	ehci_writel(&hcor->or_configflag, cmd);  	/* unblock posted write */  	cmd = ehci_readl(&hcor->or_usbcmd); -	wait_ms(5); +	mdelay(5);  	reg = HC_VERSION(ehci_readl(&hccr->cr_capbase));  	printf("USB EHCI %x.%02x\n", reg >> 8, reg & 0xff); |