~hc/RK356X_SDK_RELEASE.git

..	..	@@ -1,3 +1,4 @@
	1	+// SPDX-License-Identifier: GPL-2.0-only
1	2	/*
2	3	* cmt_speech.c - HSI CMT speech driver
3	4	*
..	..	@@ -5,20 +6,6 @@
5	6	*
6	7	* Contact: Kai Vehmanen <kai.vehmanen@nokia.com>
7	8	* Original author: Peter Ujfalusi <peter.ujfalusi@nokia.com>
8		- *
9		- * This program is free software; you can redistribute it and/or
10		- * modify it under the terms of the GNU General Public License
11		- * version 2 as published by the Free Software Foundation.
12		- *
13		- * This program is distributed in the hope that it will be useful, but
14		- * WITHOUT ANY WARRANTY; without even the implied warranty of
15		- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
16		- * General Public License for more details.
17		- *
18		- * You should have received a copy of the GNU General Public License
19		- * along with this program; if not, write to the Free Software
20		- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
21		- * 02110-1301 USA
22	9	*/
23	10
24	11	#include <linux/errno.h>
..	..	@@ -978,14 +965,13 @@
978	965
979	966	if (old_state != hi->iface_state) {
980	967	if (hi->iface_state == CS_STATE_CONFIGURED) {
981		- pm_qos_add_request(&hi->pm_qos_req,
982		- PM_QOS_CPU_DMA_LATENCY,
	968	+ cpu_latency_qos_add_request(&hi->pm_qos_req,
983	969	CS_QOS_LATENCY_FOR_DATA_USEC);
984	970	local_bh_disable();
985	971	cs_hsi_read_on_data(hi);
986	972	local_bh_enable();
987	973	} else if (old_state == CS_STATE_CONFIGURED) {
988		- pm_qos_remove_request(&hi->pm_qos_req);
	974	+ cpu_latency_qos_remove_request(&hi->pm_qos_req);
989	975	}
990	976	}
991	977	return r;
..	..	@@ -1088,8 +1074,8 @@
1088	1074	WARN_ON(!cs_state_idle(hi->control_state));
1089	1075	WARN_ON(!cs_state_idle(hi->data_state));
1090	1076
1091		- if (pm_qos_request_active(&hi->pm_qos_req))
1092		- pm_qos_remove_request(&hi->pm_qos_req);
	1077	+ if (cpu_latency_qos_request_active(&hi->pm_qos_req))
	1078	+ cpu_latency_qos_remove_request(&hi->pm_qos_req);
1093	1079
1094	1080	spin_lock_bh(&hi->lock);
1095	1081	cs_hsi_free_data(hi);