lkml.org 
[lkml]   [2012]   [Mar]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] arm/tegra: pcie: fix return value of function
    Date
    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>
    ---
    arch/arm/mach-tegra/pcie.c | 6 +++---
    1 files changed, 3 insertions(+), 3 deletions(-)

    diff --git a/arch/arm/mach-tegra/pcie.c b/arch/arm/mach-tegra/pcie.c
    index 7313059..54a816f 100644
    --- a/arch/arm/mach-tegra/pcie.c
    +++ b/arch/arm/mach-tegra/pcie.c
    @@ -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;
    @@ -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)
    --
    1.7.5.1.300.gc565c


    \
     
     \ /
      Last update: 2012-03-13 06:49    [W:0.021 / U:30.396 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site