Merge "Revert "msm: pcie: add parallelization support for pcie msm probe"" (c8f803bd) · Commits · e / devices / android_kernel_xiaomi_nabu

drivers/pci/host/pci-msm.c

+1 −22

Original line number	Diff line number	Diff line
		@@ -50,7 +50,6 @@
		#include <linux/compiler.h>
		#include <linux/ipc_logging.h>
		#include <linux/msm_pcie.h>
		#include <linux/kthread.h>

		#define PCIE_VENDOR_ID_QCOM 0x17cb

		@@ -5758,14 +5757,12 @@ static void msm_pcie_check_l1ss_support_all(struct msm_pcie_dev_t *dev)
		pci_walk_bus(dev->dev->bus, msm_pcie_check_l1ss_support, dev);
		}

		static int __msm_pcie_probe(void *arg)
		static int msm_pcie_probe(struct platform_device *pdev)
		{
		int ret = 0;
		int rc_idx = -1;
		int i, j;
		struct platform_device *pdev;

		pdev = (struct platform_device *)arg;
		PCIE_GEN_DBG("%s\n", __func__);

		mutex_lock(&pcie_drv.drv_lock);
		@@ -6253,24 +6250,6 @@ static int __msm_pcie_probe(void *arg)
		return ret;
		}

		static int msm_pcie_probe(struct platform_device *pdev)
		{
		#ifdef CONFIG_PLATFORM_AUTO
		struct task_struct *msm_pcie_task =
		kthread_run(__msm_pcie_probe, pdev,
		"msm_pcie_probe");
		if (IS_ERR(msm_pcie_task))
		return PTR_ERR(msm_pcie_task);
		else
		return 0;
		#else
		int ret = 0;

		ret = __msm_pcie_probe(pdev);
		return ret;
		#endif
		}

		static int msm_pcie_remove(struct platform_device *pdev)
		{
		int ret = 0;