]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
Revert "pcie: host: tegra: Limit number of probe deferrals"
authorBibek Basu <bbasu@nvidia.com>
Mon, 15 Dec 2014 11:31:43 +0000 (17:01 +0530)
committerLaxman Dewangan <ldewangan@nvidia.com>
Mon, 29 Dec 2014 12:08:54 +0000 (04:08 -0800)
This reverts commit 1767a0ddf7311b9949f11a4c92b7878a25f0bad3.
This revert is part of removing code which exploit deferred
probe functionality.

Bug 1581922

Change-Id: Icc083be0ecb132c407985a504fb79cefd0ee0882
Signed-off-by: Bibek Basu <bbasu@nvidia.com>
Reviewed-on: http://git-master/r/664247
Reviewed-by: Laxman Dewangan <ldewangan@nvidia.com>
Tested-by: Laxman Dewangan <ldewangan@nvidia.com>
drivers/pci/host/pci-tegra.c

index 09112ebb091caa7aedef2146d8ca8aa58725c38b..035b947abca30a6cfc73970ce78ff3cd580aa42d 100644 (file)
@@ -424,9 +424,6 @@ struct tegra_pcie_bus {
        unsigned int nr;
 };
 
-/* Maximum number of times probe can be deferred */
-static int tegra_pcie_max_deferrals = 3;
-
 /* used to avoid successive hotplug disconnect or connect */
 static bool hotplug_event;
 /* pcie mselect & xclk rate */
@@ -2521,14 +2518,8 @@ static int tegra_pcie_init(struct tegra_pcie *pcie)
                tegra_pcie_hw.sys = &pcie->sys;
                pci_common_init_dev(pcie->dev, &tegra_pcie_hw);
        } else {
+               dev_err(pcie->dev, "PCIE: no ports detected\n");
                err = -EPROBE_DEFER;
-
-               /* Defer the probe only a certain number of times */
-               if (tegra_pcie_max_deferrals-- <= 0) {
-                       dev_err(pcie->dev, "PCIE: no ports detected\n");
-                       err = 0;
-               }
-
                goto fail_enum;
        }
        tegra_pcie_enable_features(pcie);