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

Commit 945ebcf7 authored by Jebaitedneko's avatar Jebaitedneko Committed by Pranav Vashi
Browse files

techpack: audio: remove qos requests for sm8150

parent 459fc604

techpack/audio/asoc/codecs/core.h

+0 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <linux/platform_device.h>

#include <linux/of_irq.h>

#include <linux/interrupt.h>

#include <linux/pm_qos.h>



#define WCD9XXX_MAX_IRQ_REGS 4

#define WCD9XXX_MAX_NUM_IRQS (WCD9XXX_MAX_IRQ_REGS * 8)
@@ -226,7 +225,6 @@ struct wcd9xxx_core_resource { 
	struct mutex pm_lock;

	/* pm_wq notifies change of pm_state */

	wait_queue_head_t pm_wq;

	struct pm_qos_request pm_qos_req;

	int wlock_holders;

techpack/audio/asoc/codecs/wcd9xxx-irq.c

+0 −4
Original line number Diff line number Diff line
@@ -187,8 +187,6 @@ bool wcd9xxx_lock_sleep( 
	mutex_lock(&wcd9xxx_res->pm_lock);

	if (wcd9xxx_res->wlock_holders++ == 0) {

		pr_debug("%s: holding wake lock\n", __func__);

		pm_qos_update_request(&wcd9xxx_res->pm_qos_req,

				      msm_cpuidle_get_deep_idle_latency());

		pm_stay_awake(wcd9xxx_res->dev);

	}

	mutex_unlock(&wcd9xxx_res->pm_lock);
@@ -226,8 +224,6 @@ void wcd9xxx_unlock_sleep( 
		 */

		if (likely(wcd9xxx_res->pm_state == WCD9XXX_PM_AWAKE))

			wcd9xxx_res->pm_state = WCD9XXX_PM_SLEEPABLE;

		pm_qos_update_request(&wcd9xxx_res->pm_qos_req,

				PM_QOS_DEFAULT_VALUE);

		pm_relax(wcd9xxx_res->dev);

	}

	mutex_unlock(&wcd9xxx_res->pm_lock);

techpack/audio/asoc/codecs/wcd9xxx-utils.c

+0 −8
Original line number Diff line number Diff line
@@ -987,9 +987,6 @@ int wcd9xxx_core_res_init( 
	wcd9xxx_core_res->wlock_holders = 0;

	wcd9xxx_core_res->pm_state = WCD9XXX_PM_SLEEPABLE;

	init_waitqueue_head(&wcd9xxx_core_res->pm_wq);

	pm_qos_add_request(&wcd9xxx_core_res->pm_qos_req,

				PM_QOS_CPU_DMA_LATENCY,

				PM_QOS_DEFAULT_VALUE);



	wcd9xxx_core_res->num_irqs = num_irqs;

	wcd9xxx_core_res->num_irq_regs = num_irq_regs;
@@ -1014,7 +1011,6 @@ void wcd9xxx_core_res_deinit(struct wcd9xxx_core_resource *wcd9xxx_core_res) 
	if (!wcd9xxx_core_res)

		return;



	pm_qos_remove_request(&wcd9xxx_core_res->pm_qos_req);

	mutex_destroy(&wcd9xxx_core_res->pm_lock);

}

EXPORT_SYMBOL(wcd9xxx_core_res_deinit);
@@ -1066,10 +1062,6 @@ int wcd9xxx_core_res_suspend( 
	int ret = 0;



	pr_debug("%s: enter\n", __func__);

	/*

	 * pm_qos_update_request() can be called after this suspend chain call

	 * started. thus suspend can be called while lock is being held

	 */

	mutex_lock(&wcd9xxx_core_res->pm_lock);

	if (wcd9xxx_core_res->pm_state == WCD9XXX_PM_SLEEPABLE) {

		pr_debug("%s: suspending system, state %d, wlock %d\n",

techpack/audio/asoc/codecs/wcd_cpe_core.c

+2 −16
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ 
#include <linux/wait.h>

#include <linux/debugfs.h>

#include <linux/delay.h>

#include <linux/pm_qos.h>

#include <linux/dma-mapping.h>

#include <sound/soc.h>

#include <sound/info.h>
@@ -1012,13 +1011,6 @@ static void wcd_cpe_ssr_work(struct work_struct *work) 
		return;

	}



	/* Obtain pm request up in case of suspend mode */

	pm_qos_add_request(&core->pm_qos_req,

			   PM_QOS_CPU_DMA_LATENCY,

			   PM_QOS_DEFAULT_VALUE);

	pm_qos_update_request(&core->pm_qos_req,

			msm_cpuidle_get_deep_idle_latency());



	dev_dbg(core->dev,

		"%s: CPE SSR with event %d\n",

		__func__, core->ssr_type);
@@ -1053,7 +1045,7 @@ static void wcd_cpe_ssr_work(struct work_struct *work) 
			dev_err(core->dev,

				"%s: wait for cpe offline timed out\n",

				__func__);

			goto err_ret;

			return;

		}

		if (core->ssr_type != WCD_CPE_BUS_DOWN_EVENT) {

			wcd_cpe_get_sfr_dump(core);
@@ -1079,7 +1071,7 @@ static void wcd_cpe_ssr_work(struct work_struct *work) 
		dev_err(core->dev,

			"%s: ready to online timed out, status = %u\n",

			__func__, core->ready_status);

		goto err_ret;

		return;

	}



	rc = wcd_cpe_boot_ssr(core);
@@ -1090,12 +1082,6 @@ static void wcd_cpe_ssr_work(struct work_struct *work) 
	if (CPE_ERR_IRQ_CB(core))

		core->cpe_cdc_cb->cpe_err_irq_control(core->codec,

					CPE_ERR_IRQ_CLEAR, NULL);



err_ret:

	/* remove after default pm qos */

	pm_qos_update_request(&core->pm_qos_req,

			      PM_QOS_DEFAULT_VALUE);

	pm_qos_remove_request(&core->pm_qos_req);

}



/*

techpack/audio/asoc/codecs/wcd_cpe_core.h

+0 −3
Original line number Diff line number Diff line
@@ -148,9 +148,6 @@ struct wcd_cpe_core { 
	/* work to handle CPE SSR*/

	struct work_struct ssr_work;



	/* PM handle for suspend mode during SSR */

	struct pm_qos_request pm_qos_req;



	/* completion event indicating CPE OFFLINE */

	struct completion offline_compl;