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

Commit ce000fa3 authored by Yue Ma's avatar Yue Ma
Browse files

cnss2: Remove improper runtime PM enablement checks 



Currently CNSS runtime PM APIs will check runtime PM enablement using
pm_runtime_enabled() by checking for disable_depth which can be changed
at any time. This may cause usage count imbalance since the CNSS API may
skip calling the corresponding runtime PM framework API to increase or
decrease usage count. Remove all these improper checks.

Change-Id: Ibe0802fd8e41bc9ade148d374dc55295736d0c1e
Signed-off-by: default avatarYue Ma <yuem@codeaurora.org>
parent 4e4be78d

drivers/net/wireless/cnss2/pci.c

+0 −21
Original line number Diff line number Diff line
@@ -2610,9 +2610,6 @@ int cnss_pci_pm_request_resume(struct cnss_pci_data *pci_priv) 


	dev = &pci_priv->pci_dev->dev;



	if (!pm_runtime_enabled(dev))

		return 0;



	status = dev->power.runtime_status;

	if (status == RPM_SUSPENDING || status == RPM_SUSPENDED)

		cnss_pr_vdbg("Runtime PM resume is requested by %ps\n",
@@ -2631,9 +2628,6 @@ int cnss_pci_pm_runtime_resume(struct cnss_pci_data *pci_priv) 


	dev = &pci_priv->pci_dev->dev;



	if (!pm_runtime_enabled(dev))

		return 0;



	status = dev->power.runtime_status;

	if (status == RPM_SUSPENDING || status == RPM_SUSPENDED)

		cnss_pr_vdbg("Runtime PM resume is requested by %ps\n",
@@ -2652,9 +2646,6 @@ int cnss_pci_pm_runtime_get(struct cnss_pci_data *pci_priv) 


	dev = &pci_priv->pci_dev->dev;



	if (!pm_runtime_enabled(dev))

		return 0;



	status = dev->power.runtime_status;

	if (status == RPM_SUSPENDING || status == RPM_SUSPENDED)

		cnss_pr_vdbg("Runtime PM resume is requested by %ps\n",
@@ -2673,9 +2664,6 @@ int cnss_pci_pm_runtime_get_sync(struct cnss_pci_data *pci_priv) 


	dev = &pci_priv->pci_dev->dev;



	if (!pm_runtime_enabled(dev))

		return 0;



	status = dev->power.runtime_status;

	if (status == RPM_SUSPENDING || status == RPM_SUSPENDED)

		cnss_pr_vdbg("Runtime PM resume is requested by %ps\n",
@@ -2689,9 +2677,6 @@ void cnss_pci_pm_runtime_get_noresume(struct cnss_pci_data *pci_priv) 
	if (!pci_priv)

		return;



	if (!pm_runtime_enabled(&pci_priv->pci_dev->dev))

		return;



	pm_runtime_get_noresume(&pci_priv->pci_dev->dev);

}
@@ -2704,9 +2689,6 @@ int cnss_pci_pm_runtime_put_autosuspend(struct cnss_pci_data *pci_priv) 


	dev = &pci_priv->pci_dev->dev;



	if (!pm_runtime_enabled(dev))

		return 0;



	if (atomic_read(&dev->power.usage_count) == 0) {

		cnss_pr_dbg("Ignore excessive runtime PM put operation\n");

		return -EINVAL;
@@ -2724,9 +2706,6 @@ void cnss_pci_pm_runtime_put_noidle(struct cnss_pci_data *pci_priv) 


	dev = &pci_priv->pci_dev->dev;



	if (!pm_runtime_enabled(dev))

		return;



	if (atomic_read(&dev->power.usage_count) == 0) {

		cnss_pr_dbg("Ignore excessive runtime PM put operation\n");

		return;