]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
staging: octeon-usb: cvmx-usb: replace long udelays with mdelays
authorAaro Koskinen <aaro.koskinen@iki.fi>
Mon, 29 Jul 2013 17:07:49 +0000 (20:07 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 29 Jul 2013 18:41:28 +0000 (11:41 -0700)
Replace long udelays with mdelays.

Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/octeon-usb/cvmx-usb.c

index efea87b98833421cd9bfda23bb2198aab10d4787..fadc695c7d56f611af7f6e924b3c9beefee07469 100644 (file)
@@ -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);