Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

staging: octeon-usb: use __delay() instead of cvmx_wait()

Commit edf188bee1d9 ("MIPS: Octeon: Remove usage of cvmx_wait()
everywhere.") deleted cvmx_wait() but forgot to update OCTEON USB
staging driver. Fix that to allow driver build.

Fixes: edf188bee1d9 ("MIPS: Octeon: Remove usage of cvmx_wait() everywhere.")
Signed-off-by: Aaro Koskinen <aaro.koskinen@iki.fi>
Reviewed-by: James Hogan <jhogan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

authored by

Aaro Koskinen and committed by
Greg Kroah-Hartman
0590cdfe b77992d2

+3 -3
+3 -3
drivers/staging/octeon-usb/octeon-hcd.c
··· 394 394 result = -1; \ 395 395 break; \ 396 396 } else \ 397 - cvmx_wait(100); \ 397 + __delay(100); \ 398 398 } \ 399 399 } while (0); \ 400 400 result; }) ··· 774 774 usbn_clk_ctl.s.hclk_rst = 1; 775 775 cvmx_write64_uint64(CVMX_USBNX_CLK_CTL(usb->index), usbn_clk_ctl.u64); 776 776 /* 2e. Wait 64 core-clock cycles for HCLK to stabilize */ 777 - cvmx_wait(64); 777 + __delay(64); 778 778 /* 779 779 * 3. Program the power-on reset field in the USBN clock-control 780 780 * register: ··· 795 795 cvmx_write64_uint64(CVMX_USBNX_USBP_CTL_STATUS(usb->index), 796 796 usbn_usbp_ctl_status.u64); 797 797 /* 6. Wait 10 cycles */ 798 - cvmx_wait(10); 798 + __delay(10); 799 799 /* 800 800 * 7. Clear ATE_RESET field in the USBN clock-control register: 801 801 * USBN_USBP_CTL_STATUS[ATE_RESET] = 0