diff options
| author |   Aaro Koskinen <aaro.koskinen@iki.fi> | 2013-07-29 20:07:49 +0300 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-29 11:41:28 -0700 |
| commit | 2e5ae89870a6a9898e88e56be2740c4656322288 (patch) | |
| tree | 274276bc035cbd51242eac8c04753e1aab3f79bf /drivers/staging/octeon-usb | |
| parent | staging: octeon-usb: cvmx-usb: eliminate cvmx_likely/unlikely (diff) | |
| download | linux-dev-2e5ae89870a6a9898e88e56be2740c4656322288.tar.xz linux-dev-2e5ae89870a6a9898e88e56be2740c4656322288.zip | |
staging: octeon-usb: cvmx-usb: replace long udelays with mdelays
Replace long udelays with mdelays.
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/octeon-usb')
| -rw-r--r-- | drivers/staging/octeon-usb/cvmx-usb.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/staging/octeon-usb/cvmx-usb.c b/drivers/staging/octeon-usb/cvmx-usb.c index efea87b98833..fadc695c7d56 100644 --- a/drivers/staging/octeon-usb/cvmx-usb.c +++ b/drivers/staging/octeon-usb/cvmx-usb.c @@ -672,7 +672,7 @@ int cvmx_usb_initialize(cvmx_usb_state_t *state, int usb_port_number, __cvmx_usb_write_csr64(usb, CVMX_USBNX_CLK_CTL(usb->index), usbn_clk_ctl.u64); /* 4. Wait 1 ms for PHY clock to start */ - cvmx_wait_usec(1000); + mdelay(1); /* 5. Program the Reset input from automatic test equipment field in the USBP control and status register: USBN_USBP_CTL_STATUS[ATE_RESET] = 1 */ usbn_usbp_ctl_status.u64 = __cvmx_usb_read_csr64(usb, CVMX_USBNX_USBP_CTL_STATUS(usb->index)); @@ -879,7 +879,7 @@ int cvmx_usb_enable(cvmx_usb_state_t *state) /* Wait at least 50ms (high speed), or 10ms (full speed) for the reset process to complete. */ - cvmx_wait_usec(50000); + mdelay(50); /* Program the port reset bit to 0, USBC_HPRT[PRTRST] = 0 */ USB_SET_FIELD32(CVMX_USBCX_HPRT(usb->index), cvmx_usbcx_hprt_t, prtrst, 0); |