Revert "tegra: pci: Use devres for acquiring resources"

This reverts commit a07defbd48a97c437ed74799a6ec80c7960d1123
because this is one of the PCI changes that caused PCI probe
failure on Laguna T132 platform.

Bug 1542302
Original bug 200005063

Change-Id: I019ed1004844e5e9066d6b4e32da977e61512f38
Signed-off-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-on: http://git-master/r/454264
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>

diff --git a/drivers/pci/host/pci-tegra.c b/drivers/pci/host/pci-tegra.c
index e850bd723aa73a2262456c15fe94fd1b35fc86dc..7c809261943e536bf9066617ba040d3fb10dcaaf 100644 (file)
--- a/drivers/pci/host/pci-tegra.c
+++ b/drivers/pci/host/pci-tegra.c
@@ -1521,7 +1521,7 @@ static int tegra_pcie_get_resources(struct tegra_pcie *pcie)
                goto err_pwr_on;
        }
 
-       err = devm_request_irq(pcie->dev, INT_PCIE_INTR, tegra_pcie_isr,
+       err = request_irq(INT_PCIE_INTR, tegra_pcie_isr,
                        IRQF_SHARED, "PCIE", pcie);
        if (err) {
                dev_err(pcie->dev, "PCIE: Failed to register IRQ: %d\n", err);
@@ -3005,7 +3005,7 @@ static int __init tegra_pcie_probe(struct platform_device *pdev)
 
        for (i = 0; i < pcie->soc_data->num_pcie_regulators; i++) {
                pcie->pcie_regulators[i] =
-                                       devm_regulator_get(pcie->dev,
+                                       regulator_get(pcie->dev,
                        pcie->soc_data->pcie_regulator_names[i]);
                if (IS_ERR(pcie->pcie_regulators[i])) {
                        dev_err(pcie->dev, "%s: unable to get regulator %s\n",
@@ -3027,10 +3027,8 @@ static int __init tegra_pcie_probe(struct platform_device *pdev)
        pm_runtime_enable(pcie->dev);
 
        ret = tegra_pcie_init(pcie);
-       if (ret) {
+       if (ret)
                tegra_pd_remove_device(pcie->dev);
-               __pm_runtime_disable(pcie->dev, false);
-       }
 
        platform_set_drvdata(pdev, pcie);