Merge "icnss2: Export API to host driver to exit power save" (d766c1b4) · Commits · e / devices / android_kernel_fairphone_FP5

drivers/soc/qcom/icnss2/main.c

+21 −14

Original line number	Diff line number	Diff line
		@@ -2736,6 +2736,26 @@ int icnss_idle_restart(struct device *dev)
		}
		EXPORT_SYMBOL(icnss_idle_restart);

		int icnss_exit_power_save(struct device *dev)
		{
		struct icnss_priv *priv = dev_get_drvdata(dev);
		int ret = 0;

		icnss_pr_dbg("Calling Exit Power Save\n");

		if (test_bit(ICNSS_PD_RESTART, &priv->state) \|\|
		!test_bit(ICNSS_MODE_ON, &priv->state))
		return 0;

		ret = wlfw_exit_power_save_send_msg(priv);
		if (ret) {
		priv->stats.pm_resume_err++;
		return ret;
		}
		return 0;
		}
		EXPORT_SYMBOL(icnss_exit_power_save);

		void icnss_allow_recursive_recovery(struct device *dev)
		{
		struct icnss_priv *priv = dev_get_drvdata(dev);
		@@ -3348,14 +3368,6 @@ static int icnss_pm_resume(struct device *dev)
		!test_bit(ICNSS_DRIVER_PROBED, &priv->state))
		goto out;

		if (priv->device_id == WCN6750_DEVICE_ID) {
		ret = wlfw_exit_power_save_send_msg(priv);
		if (ret) {
		priv->stats.pm_resume_err++;
		return ret;
		}
		}

		ret = priv->ops->pm_resume(dev);

		out:
		@@ -3462,13 +3474,8 @@ static int icnss_pm_runtime_resume(struct device *dev)
		if (!priv->ops \|\| !priv->ops->runtime_resume)
		goto out;

		ret = wlfw_exit_power_save_send_msg(priv);
		if (ret) {
		priv->stats.pm_resume_err++;
		return ret;
		}
		icnss_pr_vdbg("Runtime resume, state: 0x%lx\n", priv->state);

		icnss_pr_vdbg("Runtime resume\n");
		ret = priv->ops->runtime_resume(dev);

		out:

+1 −0

Original line number	Diff line number	Diff line
		@@ -190,4 +190,5 @@ extern void icnss_thermal_cdev_unregister(struct device *dev, int tcdev_id);
		extern int icnss_get_curr_therm_cdev_state(struct device *dev,
		unsigned long *thermal_state,
		int tcdev_id);
		extern int icnss_exit_power_save(struct device *dev);
		#endif /* _ICNSS_WLAN_H_ */