samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
程式碼 問題 合併請求 Actions 套件 專案 版本發布 Wiki 動態

asoc: lahaina: address checkpatch error and warning

瀏覽代碼 
Checkpatch tool generates some errors and warnings due to added PM QoS feature
This change fixes these issues.

Change-Id: I0843ecd33144d7ac65649ee90ed156e97a1a2f8a
Signed-off-by: George Gao <georgao@codeaurora.org>
此提交包含在：
George Gao
2020-08-27 13:16:01 -07:00
父節點 b387595408
當前提交 e3c73874af
共有 1 個檔案被更改，包括 14 行新增 和 13 行删除
下載 Patch 檔 下載差異檔 展開所有檔案 折疊所有檔案

27
asoc/lahaina.c
查看文件

@@ -917,24 +917,23 @@ static struct wcd_mbhc_config wcd_mbhc_cfg = {
/* set audio task affinity to core 1 & 2 */ /* set audio task affinity to core 1 & 2 */
static const unsigned int audio_core_list[] = {1, 2}; static const unsigned int audio_core_list[] = {1, 2};
static cpumask_t audio_cpu_map = CPU_MASK_NONE; static cpumask_t audio_cpu_map = CPU_MASK_NONE;
static struct dev_pm_qos_request *msm_audio_req = NULL; static struct dev_pm_qos_request *msm_audio_req;
static unsigned int qos_client_active_cnt = 0; static unsigned int qos_client_active_cnt;
static void msm_audio_add_qos_request() static void msm_audio_add_qos_request(void)
{ {
int i; int i;
int cpu = 0; int cpu = 0;
msm_audio_req = kzalloc(sizeof(struct dev_pm_qos_request) * NR_CPUS, msm_audio_req = kcalloc(num_possible_cpus(),
GFP_KERNEL); sizeof(struct dev_pm_qos_request), GFP_KERNEL);
if (!msm_audio_req) { if (!msm_audio_req)
pr_err("%s failed to alloc mem for qos req.\n", __func__);
return; return;
}
for (i = 0; i < ARRAY_SIZE(audio_core_list); i++) { for (i = 0; i < ARRAY_SIZE(audio_core_list); i++) {
if (audio_core_list[i] >= NR_CPUS) if (audio_core_list[i] >= num_possible_cpus())
pr_err("%s incorrect cpu id: %d specified.\n", __func__, audio_core_list[i]); pr_err("%s incorrect cpu id: %d specified.\n",
__func__, audio_core_list[i]);
else else
cpumask_set_cpu(audio_core_list[i], &audio_cpu_map); cpumask_set_cpu(audio_core_list[i], &audio_cpu_map);
} }
@@ -948,7 +947,7 @@ static void msm_audio_add_qos_request()
} }
} }
static void msm_audio_remove_qos_request() static void msm_audio_remove_qos_request(void)
{ {
int cpu = 0; int cpu = 0;
@@ -956,7 +955,8 @@ static void msm_audio_remove_qos_request()
for_each_cpu(cpu, &audio_cpu_map) { for_each_cpu(cpu, &audio_cpu_map) {
dev_pm_qos_remove_request( dev_pm_qos_remove_request(
&msm_audio_req[cpu]); &msm_audio_req[cpu]);
pr_debug("%s remove cpu affinity of core %d.\n", __func__, cpu); pr_debug("%s remove cpu affinity of core %d.\n",
__func__, cpu);
} }
kfree(msm_audio_req); kfree(msm_audio_req);
} }
@@ -970,7 +970,8 @@ static void msm_audio_update_qos_request(u32 latency)
for_each_cpu(cpu, &audio_cpu_map) { for_each_cpu(cpu, &audio_cpu_map) {
dev_pm_qos_update_request( dev_pm_qos_update_request(
&msm_audio_req[cpu], latency); &msm_audio_req[cpu], latency);
pr_debug("%s update latency of core %d to %ul.\n", __func__, cpu, latency); pr_debug("%s update latency of core %d to %ul.\n",
__func__, cpu, latency);
} }
} }
} }