Commit 2f926eec authored by Dmitry Artamonow's avatar Dmitry Artamonow Committed by Olof Johansson

arm/tegra: pcie: fix return value of function

In previous patch (arm/tegra: add timeout to PCIe PLL lock detection loop)
tegra_pcie_enable_controller() function type has been changed from
void to int, but the last return statement wasn't converted, so
function returns undefined value. Fix it.

Also while at it, address couple of minor concerns raised by reviewers:
use usleep_range for delay, and lower the value of timeout to 300ms
to be consistent with Nvidia Vibrante kernel.
Signed-off-by: default avatarDmitry Artamonow <mad_soft@inbox.ru>
Acked-by: default avatarStephen Warren <swarren@wwwdotorg.org>
Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parent 795d5fd4
...@@ -639,10 +639,10 @@ static int tegra_pcie_enable_controller(void) ...@@ -639,10 +639,10 @@ static int tegra_pcie_enable_controller(void)
pads_writel(0xfa5cfa5c, 0xc8); pads_writel(0xfa5cfa5c, 0xc8);
/* Wait for the PLL to lock */ /* Wait for the PLL to lock */
timeout = 2000; timeout = 300;
do { do {
val = pads_readl(PADS_PLL_CTL); val = pads_readl(PADS_PLL_CTL);
mdelay(1); usleep_range(1000, 1000);
if (--timeout == 0) { if (--timeout == 0) {
pr_err("Tegra PCIe error: timeout waiting for PLL\n"); pr_err("Tegra PCIe error: timeout waiting for PLL\n");
return -EBUSY; return -EBUSY;
...@@ -677,7 +677,7 @@ static int tegra_pcie_enable_controller(void) ...@@ -677,7 +677,7 @@ static int tegra_pcie_enable_controller(void)
/* Disable all execptions */ /* Disable all execptions */
afi_writel(0, AFI_FPCI_ERROR_MASKS); afi_writel(0, AFI_FPCI_ERROR_MASKS);
return; return 0;
} }
static void tegra_pcie_xclk_clamp(bool clamp) static void tegra_pcie_xclk_clamp(bool clamp)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment