From fa01a84d23554be3e179719aae964d988b84e917 Mon Sep 17 00:00:00 2001 From: Vignesh Kulothungan Date: Fri, 31 Jan 2020 16:09:29 -0800 Subject: [PATCH] audio: correct misspelled variable and functions Update dai link names to match with machine driver. Update typo in audio notifier function name. Change-Id: I8ada233bbcb1596f245cf1925691c115c2d62755 Signed-off-by: Vignesh Kulothungan --- asoc/msm_dailink.h | 26 ++++++------- dsp/audio_notifier.c | 88 ++++++++++++++++++++++---------------------- 2 files changed, 57 insertions(+), 57 deletions(-) diff --git a/asoc/msm_dailink.h b/asoc/msm_dailink.h index 718a24c2a0..4093724d4a 100644 --- a/asoc/msm_dailink.h +++ b/asoc/msm_dailink.h @@ -7,12 +7,12 @@ /* FE dai-links */ SND_SOC_DAILINK_DEFS(multimedia1, - DAILINK_COMP_ARRAY(COMP_CPU("Multimedia1")), + DAILINK_COMP_ARRAY(COMP_CPU("MultiMedia1")), DAILINK_COMP_ARRAY(COMP_CODEC("snd-soc-dummy", "snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-pcm-dsp.0"))); SND_SOC_DAILINK_DEFS(multimedia2, - DAILINK_COMP_ARRAY(COMP_CPU("Multimedia2")), + DAILINK_COMP_ARRAY(COMP_CPU("MultiMedia2")), DAILINK_COMP_ARRAY(COMP_CODEC("snd-soc-dummy", "snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-pcm-dsp.0"))); @@ -27,7 +27,7 @@ SND_SOC_DAILINK_DEFS(msmvoip, DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-voip-dsp"))); SND_SOC_DAILINK_DEFS(multimedia3, - DAILINK_COMP_ARRAY(COMP_CPU("Multimedia3")), + DAILINK_COMP_ARRAY(COMP_CPU("MultiMedia3")), DAILINK_COMP_ARRAY(COMP_CODEC("snd-soc-dummy", "snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-pcm-dsp.2"))); @@ -42,7 +42,7 @@ SND_SOC_DAILINK_DEFS(afepcm_tx, DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-pcm-afe"))); SND_SOC_DAILINK_DEFS(multimedia4, - DAILINK_COMP_ARRAY(COMP_CPU("Multimedia4")), + DAILINK_COMP_ARRAY(COMP_CPU("MultiMedia4")), DAILINK_COMP_ARRAY(COMP_CODEC("snd-soc-dummy", "snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-compress-dsp"))); @@ -52,7 +52,7 @@ SND_SOC_DAILINK_DEFS(auxpcm_hostless, DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-pcm-hostless"))); SND_SOC_DAILINK_DEFS(multimedia5, - DAILINK_COMP_ARRAY(COMP_CPU("Multimedia5")), + DAILINK_COMP_ARRAY(COMP_CPU("MultiMedia5")), DAILINK_COMP_ARRAY(COMP_CODEC("snd-soc-dummy", "snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-pcm-dsp.1"))); @@ -62,17 +62,17 @@ SND_SOC_DAILINK_DEFS(listen1, DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-lsm-client"))); SND_SOC_DAILINK_DEFS(multimedia7, - DAILINK_COMP_ARRAY(COMP_CPU("Multimedia7")), + DAILINK_COMP_ARRAY(COMP_CPU("MultiMedia7")), DAILINK_COMP_ARRAY(COMP_CODEC("snd-soc-dummy", "snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-compress-dsp"))); SND_SOC_DAILINK_DEFS(multimedia10, - DAILINK_COMP_ARRAY(COMP_CPU("Multimedia10")), + DAILINK_COMP_ARRAY(COMP_CPU("MultiMedia10")), DAILINK_COMP_ARRAY(COMP_CODEC("snd-soc-dummy", "snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-pcm-dsp.1"))); SND_SOC_DAILINK_DEFS(multimedia8, - DAILINK_COMP_ARRAY(COMP_CPU("Multimedia8")), + DAILINK_COMP_ARRAY(COMP_CPU("MultiMedia8")), DAILINK_COMP_ARRAY(COMP_CODEC("snd-soc-dummy", "snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-pcm-dsp-noirq"))); @@ -117,7 +117,7 @@ SND_SOC_DAILINK_DEFS(listen7, DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-lsm-client"))); SND_SOC_DAILINK_DEFS(listen8, - DAILINK_COMP_ARRAY(COMP_CPU("lsm8")), + DAILINK_COMP_ARRAY(COMP_CPU("LSM8")), DAILINK_COMP_ARRAY(COMP_CODEC("snd-soc-dummy", "snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-lsm-client"))); @@ -167,7 +167,7 @@ SND_SOC_DAILINK_DEFS(tx3_cdcdma_hostless, DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-pcm-hostless"))); SND_SOC_DAILINK_DEFS(tert_mi2s_tx_hostless, - DAILINK_COMP_ARRAY(COMP_CPU("ERT_MI2S_TX_HOSTLESS")), + DAILINK_COMP_ARRAY(COMP_CPU("TERT_MI2S_TX_HOSTLESS")), DAILINK_COMP_ARRAY(COMP_CODEC("snd-soc-dummy", "snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-pcm-hostless"))); @@ -187,17 +187,17 @@ SND_SOC_DAILINK_DEFS(usbaudio_hostless, DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-pcm-hostless"))); SND_SOC_DAILINK_DEFS(slimbus7_hostless, - DAILINK_COMP_ARRAY(COMP_CPU("SLIMBUS_7_HOSTLESS")), + DAILINK_COMP_ARRAY(COMP_CPU("SLIMBUS7_HOSTLESS")), DAILINK_COMP_ARRAY(COMP_CODEC("snd-soc-dummy", "snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-pcm-hostless"))); SND_SOC_DAILINK_DEFS(multimedia17, DAILINK_COMP_ARRAY(COMP_CPU("MultiMedia17")), DAILINK_COMP_ARRAY(COMP_CODEC("snd-soc-dummy", "snd-soc-dummy-dai")), - DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-compress-dap"))); + DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-compress-dsp"))); SND_SOC_DAILINK_DEFS(slimbus8_hostless, - DAILINK_COMP_ARRAY(COMP_CPU("SLIMBUS_8_HOSTLESS")), + DAILINK_COMP_ARRAY(COMP_CPU("SLIMBUS8_HOSTLESS")), DAILINK_COMP_ARRAY(COMP_CODEC("snd-soc-dummy", "snd-soc-dummy-dai")), DAILINK_COMP_ARRAY(COMP_PLATFORM("msm-pcm-hostless"))); diff --git a/dsp/audio_notifier.c b/dsp/audio_notifier.c index 56cfa31fa6..888d162d43 100644 --- a/dsp/audio_notifier.c +++ b/dsp/audio_notifier.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-only /* - * Copyright (c) 2016-2017, The Linux Foundation. All rights reserved. + * Copyright (c) 2016-2017, 2020 The Linux Foundation. All rights reserved. */ #include @@ -47,25 +47,25 @@ struct service_info { struct srcu_notifier_head client_nb_list; }; -static int audio_notifer_ssr_adsp_cb(struct notifier_block *this, +static int audio_notifier_ssr_adsp_cb(struct notifier_block *this, unsigned long opcode, void *data); -static int audio_notifer_ssr_modem_cb(struct notifier_block *this, +static int audio_notifier_ssr_modem_cb(struct notifier_block *this, unsigned long opcode, void *data); -static int audio_notifer_pdr_adsp_cb(struct notifier_block *this, +static int audio_notifier_pdr_adsp_cb(struct notifier_block *this, unsigned long opcode, void *data); static struct notifier_block notifier_ssr_adsp_nb = { - .notifier_call = audio_notifer_ssr_adsp_cb, + .notifier_call = audio_notifier_ssr_adsp_cb, .priority = 0, }; static struct notifier_block notifier_ssr_modem_nb = { - .notifier_call = audio_notifer_ssr_modem_cb, + .notifier_call = audio_notifier_ssr_modem_cb, .priority = 0, }; static struct notifier_block notifier_pdr_adsp_nb = { - .notifier_call = audio_notifer_pdr_adsp_cb, + .notifier_call = audio_notifier_pdr_adsp_cb, .priority = 0, }; @@ -102,7 +102,7 @@ static struct service_info service_data[AUDIO_NOTIFIER_MAX_SERVICES] struct list_head client_list; struct mutex notifier_mutex; -static int audio_notifer_get_default_service(int domain) +static int audio_notifier_get_default_service(int domain) { int service = NO_SERVICE; @@ -119,7 +119,7 @@ static int audio_notifer_get_default_service(int domain) return service; } -static void audio_notifer_disable_service(int service) +static void audio_notifier_disable_service(int service) { int i; @@ -127,7 +127,7 @@ static void audio_notifer_disable_service(int service) service_data[service][i].state = NO_SERVICE; } -static bool audio_notifer_is_service_enabled(int service) +static bool audio_notifier_is_service_enabled(int service) { int i; @@ -137,7 +137,7 @@ static bool audio_notifer_is_service_enabled(int service) return false; } -static void audio_notifer_init_service(int service) +static void audio_notifier_init_service(int service) { int i; @@ -148,7 +148,7 @@ static void audio_notifer_init_service(int service) } } -static int audio_notifer_reg_service(int service, int domain) +static int audio_notifier_reg_service(int service, int domain) { void *handle; int ret = 0; @@ -195,7 +195,7 @@ done: return ret; } -static int audio_notifer_dereg_service(int service, int domain) +static int audio_notifier_dereg_service(int service, int domain) { int ret; @@ -232,7 +232,7 @@ done: return ret; } -static int audio_notifer_reg_client_service(struct client_data *client_data, +static int audio_notifier_reg_client_service(struct client_data *client_data, int service) { int ret = 0; @@ -243,7 +243,7 @@ static int audio_notifer_reg_client_service(struct client_data *client_data, case AUDIO_NOTIFIER_SSR_SERVICE: case AUDIO_NOTIFIER_PDR_SERVICE: if (service_data[service][domain].num_of_clients == 0) - ret = audio_notifer_reg_service(service, domain); + ret = audio_notifier_reg_service(service, domain); break; default: pr_err("%s: Invalid service for client %s, service %d, domain %d\n", @@ -284,13 +284,13 @@ done: return ret; } -static int audio_notifer_reg_client(struct client_data *client_data) +static int audio_notifier_reg_client(struct client_data *client_data) { int ret = 0; int service; int domain = client_data->domain; - service = audio_notifer_get_default_service(domain); + service = audio_notifier_get_default_service(domain); if (service < 0) { pr_err("%s: service %d is incorrect\n", __func__, service); ret = -EINVAL; @@ -320,7 +320,7 @@ static int audio_notifer_reg_client(struct client_data *client_data) __func__, client_data->client_name, service_data[service][domain].name); - ret = audio_notifer_reg_client_service(client_data, service); + ret = audio_notifier_reg_client_service(client_data, service); if (ret < 0) pr_err("%s: client %s failed to register on service %s", __func__, client_data->client_name, @@ -331,7 +331,7 @@ done: return ret; } -static int audio_notifer_dereg_client(struct client_data *client_data) +static int audio_notifier_dereg_client(struct client_data *client_data) { int ret = 0; int service = client_data->service; @@ -341,7 +341,7 @@ static int audio_notifer_dereg_client(struct client_data *client_data) case AUDIO_NOTIFIER_SSR_SERVICE: case AUDIO_NOTIFIER_PDR_SERVICE: if (service_data[service][domain].num_of_clients == 1) - ret = audio_notifer_dereg_service(service, domain); + ret = audio_notifier_dereg_service(service, domain); break; case NO_SERVICE: goto done; @@ -379,7 +379,7 @@ done: return ret; } -static void audio_notifer_reg_all_clients(void) +static void audio_notifier_reg_all_clients(void) { struct list_head *ptr, *next; struct client_data *client_data; @@ -388,36 +388,36 @@ static void audio_notifer_reg_all_clients(void) list_for_each_safe(ptr, next, &client_list) { client_data = list_entry(ptr, struct client_data, list); - ret = audio_notifer_reg_client(client_data); + ret = audio_notifier_reg_client(client_data); if (ret < 0) - pr_err("%s: audio_notifer_reg_client failed for client %s, ret %d\n", + pr_err("%s: audio_notifier_reg_client failed for client %s, ret %d\n", __func__, client_data->client_name, ret); } } -static int audio_notifer_pdr_callback(struct notifier_block *this, +static int audio_notifier_pdr_callback(struct notifier_block *this, unsigned long opcode, void *data) { pr_debug("%s: Audio PDR framework state 0x%lx\n", __func__, opcode); mutex_lock(¬ifier_mutex); if (opcode == AUDIO_PDR_FRAMEWORK_DOWN) - audio_notifer_disable_service(AUDIO_NOTIFIER_PDR_SERVICE); + audio_notifier_disable_service(AUDIO_NOTIFIER_PDR_SERVICE); else - audio_notifer_init_service(AUDIO_NOTIFIER_PDR_SERVICE); + audio_notifier_init_service(AUDIO_NOTIFIER_PDR_SERVICE); - audio_notifer_reg_all_clients(); + audio_notifier_reg_all_clients(); mutex_unlock(¬ifier_mutex); return 0; } static struct notifier_block pdr_nb = { - .notifier_call = audio_notifer_pdr_callback, + .notifier_call = audio_notifier_pdr_callback, .priority = 0, }; -static int audio_notifer_convert_opcode(unsigned long opcode, +static int audio_notifier_convert_opcode(unsigned long opcode, unsigned long *notifier_opcode) { int ret = 0; @@ -439,14 +439,14 @@ static int audio_notifer_convert_opcode(unsigned long opcode, return ret; } -static int audio_notifer_service_cb(unsigned long opcode, +static int audio_notifier_service_cb(unsigned long opcode, int service, int domain) { int ret = 0; unsigned long notifier_opcode; struct audio_notifier_cb_data data; - if (audio_notifer_convert_opcode(opcode, ¬ifier_opcode) < 0) + if (audio_notifier_convert_opcode(opcode, ¬ifier_opcode) < 0) goto done; data.service = service; @@ -470,26 +470,26 @@ done: return NOTIFY_OK; } -static int audio_notifer_pdr_adsp_cb(struct notifier_block *this, +static int audio_notifier_pdr_adsp_cb(struct notifier_block *this, unsigned long opcode, void *data) { - return audio_notifer_service_cb(opcode, + return audio_notifier_service_cb(opcode, AUDIO_NOTIFIER_PDR_SERVICE, AUDIO_NOTIFIER_ADSP_DOMAIN); } -static int audio_notifer_ssr_adsp_cb(struct notifier_block *this, +static int audio_notifier_ssr_adsp_cb(struct notifier_block *this, unsigned long opcode, void *data) { - return audio_notifer_service_cb(opcode, + return audio_notifier_service_cb(opcode, AUDIO_NOTIFIER_SSR_SERVICE, AUDIO_NOTIFIER_ADSP_DOMAIN); } -static int audio_notifer_ssr_modem_cb(struct notifier_block *this, +static int audio_notifier_ssr_modem_cb(struct notifier_block *this, unsigned long opcode, void *data) { - return audio_notifer_service_cb(opcode, + return audio_notifier_service_cb(opcode, AUDIO_NOTIFIER_SSR_SERVICE, AUDIO_NOTIFIER_MODEM_DOMAIN); } @@ -510,9 +510,9 @@ int audio_notifier_deregister(char *client_name) list_for_each_safe(ptr, next, &client_list) { client_data = list_entry(ptr, struct client_data, list); if (!strcmp(client_name, client_data->client_name)) { - ret2 = audio_notifer_dereg_client(client_data); + ret2 = audio_notifier_dereg_client(client_data); if (ret2 < 0) { - pr_err("%s: audio_notifer_dereg_client failed, ret %d\n, service %d, domain %d", + pr_err("%s: audio_notifier_dereg_client failed, ret %d\n, service %d, domain %d", __func__, ret2, client_data->service, client_data->domain); ret = ret2; @@ -557,10 +557,10 @@ int audio_notifier_register(char *client_name, int domain, client_data->domain = domain; mutex_lock(¬ifier_mutex); - ret = audio_notifer_reg_client(client_data); + ret = audio_notifier_reg_client(client_data); if (ret < 0) { mutex_unlock(¬ifier_mutex); - pr_err("%s: audio_notifer_reg_client for client %s failed ret = %d\n", + pr_err("%s: audio_notifier_reg_client for client %s failed ret = %d\n", __func__, client_data->client_name, ret); kfree(client_data); @@ -599,8 +599,8 @@ static int __init audio_notifier_late_init(void) * Do in late init to ensure that SSR subsystem is initialized */ mutex_lock(¬ifier_mutex); - if (!audio_notifer_is_service_enabled(AUDIO_NOTIFIER_PDR_SERVICE)) - audio_notifer_reg_all_clients(); + if (!audio_notifier_is_service_enabled(AUDIO_NOTIFIER_PDR_SERVICE)) + audio_notifier_reg_all_clients(); mutex_unlock(¬ifier_mutex); return 0; @@ -616,7 +616,7 @@ static int __init audio_notifier_init(void) if (ret < 0) { pr_err("%s: PDR register failed, ret = %d, disable service\n", __func__, ret); - audio_notifer_disable_service(AUDIO_NOTIFIER_PDR_SERVICE); + audio_notifier_disable_service(AUDIO_NOTIFIER_PDR_SERVICE); } /* Do not return error since PDR enablement is not critical */