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_hub.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 'common/usb_hub.c')
| -rw-r--r-- | common/usb_hub.c | 10 | 
1 files changed, 5 insertions, 5 deletions
| diff --git a/common/usb_hub.c b/common/usb_hub.c index 84d0d3f9c..e0edaad56 100644 --- a/common/usb_hub.c +++ b/common/usb_hub.c @@ -120,7 +120,7 @@ static void usb_hub_power_on(struct usb_hub_device *hub)  	}  	/* Wait at least 100 msec for power to become stable */ -	wait_ms(max(pgood_delay, (unsigned)100)); +	mdelay(max(pgood_delay, (unsigned)100));  }  void usb_hub_reset(void) @@ -160,7 +160,7 @@ int hub_port_reset(struct usb_device *dev, int port,  	for (tries = 0; tries < MAX_TRIES; tries++) {  		usb_set_port_feature(dev, port + 1, USB_PORT_FEAT_RESET); -		wait_ms(200); +		mdelay(200);  		if (usb_get_port_status(dev, port + 1, &portsts) < 0) {  			USB_HUB_PRINTF("get_port_status failed status %lX\n", @@ -187,7 +187,7 @@ int hub_port_reset(struct usb_device *dev, int port,  		if (portstatus & USB_PORT_STAT_ENABLE)  			break; -		wait_ms(200); +		mdelay(200);  	}  	if (tries == MAX_TRIES) { @@ -232,7 +232,7 @@ void usb_hub_port_connect_change(struct usb_device *dev, int port)  		if (!(portstatus & USB_PORT_STAT_CONNECTION))  			return;  	} -	wait_ms(200); +	mdelay(200);  	/* Reset the port */  	if (hub_port_reset(dev, port, &portstatus) < 0) { @@ -240,7 +240,7 @@ void usb_hub_port_connect_change(struct usb_device *dev, int port)  		return;  	} -	wait_ms(200); +	mdelay(200);  	/* Allocate a new device struct for it */  	usb = usb_alloc_new_device(); |