Skip to content

Commit

Permalink
arm/tegra: pcie: fix return value of function
Browse files Browse the repository at this point in the history
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: Dmitry Artamonow <mad_soft@inbox.ru>
Acked-by: Stephen Warren <swarren@wwwdotorg.org>
Signed-off-by: Olof Johansson <olof@lixom.net>
  • Loading branch information
Dmitry Artamonow authored and Olof Johansson committed Mar 18, 2012
1 parent 795d5fd commit 2f926ee
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions arch/arm/mach-tegra/pcie.c
Original file line number Diff line number Diff line change
Expand Up @@ -639,10 +639,10 @@ static int tegra_pcie_enable_controller(void)
pads_writel(0xfa5cfa5c, 0xc8);

/* Wait for the PLL to lock */
timeout = 2000;
timeout = 300;
do {
val = pads_readl(PADS_PLL_CTL);
mdelay(1);
usleep_range(1000, 1000);
if (--timeout == 0) {
pr_err("Tegra PCIe error: timeout waiting for PLL\n");
return -EBUSY;
Expand Down Expand Up @@ -677,7 +677,7 @@ static int tegra_pcie_enable_controller(void)
/* Disable all execptions */
afi_writel(0, AFI_FPCI_ERROR_MASKS);

return;
return 0;
}

static void tegra_pcie_xclk_clamp(bool clamp)
Expand Down

0 comments on commit 2f926ee

Please sign in to comment.