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

Commit 0f383d5a authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss2: Remove improper runtime PM enablement checks"

parents 1ddf3853 a40a21d1

drivers/net/wireless/cnss2/pci.c

+0 −21
Original line number Diff line number Diff line
@@ -2734,9 +2734,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",
@@ -2755,9 +2752,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",
@@ -2776,9 +2770,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",
@@ -2797,9 +2788,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",
@@ -2813,9 +2801,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);

}
@@ -2828,9 +2813,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;
@@ -2848,9 +2830,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;