Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5b4a2f09 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss: Fix parameter for PCIe APIs"

parents 99d9362c 636b18c5

drivers/net/wireless/cnss/cnss.c

+12 −12
Original line number Diff line number Diff line
@@ -564,7 +564,7 @@ static int cnss_wlan_pci_probe(struct pci_dev *pdev, 


		ret = msm_pcie_pm_control(MSM_PCIE_SUSPEND,

					  cnss_get_pci_dev_bus_number(pdev),

					  NULL, NULL, PM_OPTIONS);

					  pdev, NULL, PM_OPTIONS);

		if (ret) {

			pr_err("Failed to shutdown PCIe link\n");

			goto err_pcie_suspend;
@@ -709,7 +709,7 @@ again: 
	if (!penv->pcie_link_state && !penv->pcie_link_down_ind) {

		ret = msm_pcie_pm_control(MSM_PCIE_RESUME,

					  cnss_get_pci_dev_bus_number(pdev),

					  NULL, NULL, PM_OPTIONS);

					  pdev, NULL, PM_OPTIONS);

		if (ret) {

			pr_err("PCIe link bring-up failed\n");

			goto err_pcie_link_up;
@@ -719,7 +719,7 @@ again: 


		ret = msm_pcie_pm_control(MSM_PCIE_RESUME,

				cnss_get_pci_dev_bus_number(pdev),

				NULL, NULL, PM_OPTIONS_RESUME_LINK_DOWN);

				pdev, NULL, PM_OPTIONS_RESUME_LINK_DOWN);



		if (ret) {

			pr_err("PCIe link bring-up failed (link down option)\n");
@@ -750,7 +750,7 @@ again: 
			penv->saved_state = pci_store_saved_state(pdev);

			msm_pcie_pm_control(MSM_PCIE_SUSPEND,

					    cnss_get_pci_dev_bus_number(pdev),

					    NULL, NULL, PM_OPTIONS);

					    pdev, NULL, PM_OPTIONS);

			penv->pcie_link_state = PCIE_LINK_DOWN;

			cnss_wlan_gpio_set(gpio_info, WLAN_EN_LOW);

			usleep(WLAN_ENABLE_DELAY);
@@ -784,7 +784,7 @@ err_wlan_probe: 
err_pcie_recover:

	msm_pcie_pm_control(MSM_PCIE_SUSPEND,

			    cnss_get_pci_dev_bus_number(pdev),

			    NULL, NULL, PM_OPTIONS);

			    pdev, NULL, PM_OPTIONS);

	penv->pcie_link_state = PCIE_LINK_DOWN;



err_pcie_link_up:
@@ -841,7 +841,7 @@ void cnss_wlan_unregister_driver(struct cnss_wlan_driver *driver) 


		if (msm_pcie_pm_control(MSM_PCIE_SUSPEND,

					cnss_get_pci_dev_bus_number(pdev),

					NULL, NULL, PM_OPTIONS)) {

					pdev, NULL, PM_OPTIONS)) {

			pr_err("Failed to shutdown PCIe link\n");

			return;

		}
@@ -850,7 +850,7 @@ void cnss_wlan_unregister_driver(struct cnss_wlan_driver *driver) 


		if (msm_pcie_pm_control(MSM_PCIE_SUSPEND,

				cnss_get_pci_dev_bus_number(pdev),

				NULL, NULL, PM_OPTIONS_SUSPEND_LINK_DOWN)) {

				pdev, NULL, PM_OPTIONS_SUSPEND_LINK_DOWN)) {

			pr_err("Failed to shutdown PCIe link (with linkdown option)\n");

			return;

		}
@@ -1068,7 +1068,7 @@ static int cnss_shutdown(const struct subsys_desc *subsys, bool force_stop) 
		penv->saved_state = pci_store_saved_state(pdev);

		if (msm_pcie_pm_control(MSM_PCIE_SUSPEND,

					cnss_get_pci_dev_bus_number(pdev),

					NULL, NULL, PM_OPTIONS)) {

					pdev, NULL, PM_OPTIONS)) {

			pr_debug("cnss: Failed to shutdown PCIe link!\n");

			ret = -EFAULT;

		}
@@ -1076,7 +1076,7 @@ static int cnss_shutdown(const struct subsys_desc *subsys, bool force_stop) 
	} else if (penv->pcie_link_state && penv->pcie_link_down_ind) {

		if (msm_pcie_pm_control(MSM_PCIE_SUSPEND,

				cnss_get_pci_dev_bus_number(pdev),

				NULL, NULL, PM_OPTIONS_SUSPEND_LINK_DOWN)) {

				pdev, NULL, PM_OPTIONS_SUSPEND_LINK_DOWN)) {

			pr_debug("cnss: Failed to shutdown PCIe link!\n");

			ret = -EFAULT;

		}
@@ -1130,7 +1130,7 @@ static int cnss_powerup(const struct subsys_desc *subsys) 
	if (!penv->pcie_link_state && !penv->pcie_link_down_ind) {

		ret = msm_pcie_pm_control(MSM_PCIE_RESUME,

				  cnss_get_pci_dev_bus_number(pdev),

				  NULL, NULL, PM_OPTIONS);

				  pdev, NULL, PM_OPTIONS);



		if (ret) {

			pr_err("cnss: Failed to bring-up PCIe link!\n");
@@ -1141,7 +1141,7 @@ static int cnss_powerup(const struct subsys_desc *subsys) 
	} else if (!penv->pcie_link_state && penv->pcie_link_down_ind) {

		ret = msm_pcie_pm_control(MSM_PCIE_RESUME,

			cnss_get_pci_dev_bus_number(pdev),

			NULL, NULL, PM_OPTIONS_RESUME_LINK_DOWN);

			pdev, NULL, PM_OPTIONS_RESUME_LINK_DOWN);



		if (ret) {

			pr_err("cnss: Failed to bring-up PCIe link!\n");
@@ -1185,7 +1185,7 @@ err_wlan_reinit: 
	penv->saved_state = pci_store_saved_state(pdev);

	msm_pcie_pm_control(MSM_PCIE_SUSPEND,

			cnss_get_pci_dev_bus_number(pdev),

			NULL, NULL, PM_OPTIONS);

			pdev, NULL, PM_OPTIONS);

	penv->pcie_link_state = PCIE_LINK_DOWN;



err_pcie_link_up: