ASOC: msm: Modify debug messages and conditional checks
Modify debug messages, remove deprecated functions,
proper handling of local pointers, check valid range
of values in conditional checks, check array boundaries
in conditions
Change-Id: I0b20297261727143ec3099599274916404007463
Signed-off-by: Bharath Ramachandramurthy <bramacha@codeaurora.org>
Signed-off-by: Swaminathan Sathappan <Swami@codeaurora.org>
diff --git a/arch/arm/mach-msm/qdsp6v2/apr.c b/arch/arm/mach-msm/qdsp6v2/apr.c
index 541f62f..b5f071f 100644
--- a/arch/arm/mach-msm/qdsp6v2/apr.c
+++ b/arch/arm/mach-msm/qdsp6v2/apr.c
@@ -255,9 +255,9 @@
if (!dest || !svc_name || !svc_fn)
return NULL;
- if (!strcmp(dest, "ADSP"))
+ if (!strncmp(dest, "ADSP", 4))
dest_id = APR_DEST_QDSP6;
- else if (!strcmp(dest, "MODEM")) {
+ else if (!strncmp(dest, "MODEM", 5)) {
dest_id = APR_DEST_MODEM;
} else {
pr_err("APR: wrong destination\n");
@@ -286,23 +286,23 @@
pr_info("%s: modem Up\n", __func__);
}
- if (!strcmp(svc_name, "AFE")) {
+ if (!strncmp(svc_name, "AFE", 3)) {
client_id = APR_CLIENT_AUDIO;
svc_idx = 0;
svc_id = APR_SVC_AFE;
- } else if (!strcmp(svc_name, "ASM")) {
+ } else if (!strncmp(svc_name, "ASM", 3)) {
client_id = APR_CLIENT_AUDIO;
svc_idx = 1;
svc_id = APR_SVC_ASM;
- } else if (!strcmp(svc_name, "ADM")) {
+ } else if (!strncmp(svc_name, "ADM", 3)) {
client_id = APR_CLIENT_AUDIO;
svc_idx = 2;
svc_id = APR_SVC_ADM;
- } else if (!strcmp(svc_name, "CORE")) {
+ } else if (!strncmp(svc_name, "CORE", 4)) {
client_id = APR_CLIENT_AUDIO;
svc_idx = 3;
svc_id = APR_SVC_ADSP_CORE;
- } else if (!strcmp(svc_name, "TEST")) {
+ } else if (!strncmp(svc_name, "TEST", 4)) {
if (dest_id == APR_DEST_QDSP6) {
client_id = APR_CLIENT_AUDIO;
svc_idx = 4;
@@ -311,19 +311,19 @@
svc_idx = 7;
}
svc_id = APR_SVC_TEST_CLIENT;
- } else if (!strcmp(svc_name, "VSM")) {
+ } else if (!strncmp(svc_name, "VSM", 3)) {
client_id = APR_CLIENT_VOICE;
svc_idx = 0;
svc_id = APR_SVC_VSM;
- } else if (!strcmp(svc_name, "VPM")) {
+ } else if (!strncmp(svc_name, "VPM", 3)) {
client_id = APR_CLIENT_VOICE;
svc_idx = 1;
svc_id = APR_SVC_VPM;
- } else if (!strcmp(svc_name, "MVS")) {
+ } else if (!strncmp(svc_name, "MVS", 3)) {
client_id = APR_CLIENT_VOICE;
svc_idx = 2;
svc_id = APR_SVC_MVS;
- } else if (!strcmp(svc_name, "MVM")) {
+ } else if (!strncmp(svc_name, "MVM", 3)) {
if (dest_id == APR_DEST_MODEM) {
client_id = APR_CLIENT_VOICE;
svc_idx = 3;
@@ -333,7 +333,7 @@
svc_idx = 5;
svc_id = APR_SVC_ADSP_MVM;
}
- } else if (!strcmp(svc_name, "CVS")) {
+ } else if (!strncmp(svc_name, "CVS", 3)) {
if (dest_id == APR_DEST_MODEM) {
client_id = APR_CLIENT_VOICE;
svc_idx = 4;
@@ -343,7 +343,7 @@
svc_idx = 6;
svc_id = APR_SVC_ADSP_CVS;
}
- } else if (!strcmp(svc_name, "CVP")) {
+ } else if (!strncmp(svc_name, "CVP", 3)) {
if (dest_id == APR_DEST_MODEM) {
client_id = APR_CLIENT_VOICE;
svc_idx = 5;
@@ -353,7 +353,7 @@
svc_idx = 7;
svc_id = APR_SVC_ADSP_CVP;
}
- } else if (!strcmp(svc_name, "SRD")) {
+ } else if (!strncmp(svc_name, "SRD", 3)) {
client_id = APR_CLIENT_VOICE;
svc_idx = 6;
svc_id = APR_SVC_SRD;
@@ -679,16 +679,13 @@
static int __init apr_late_init(void)
{
- void *ret;
+ int ret = 0;
init_waitqueue_head(&dsp_wait);
init_waitqueue_head(&modem_wait);
atomic_set(&dsp_state, 1);
atomic_set(&modem_state, 1);
- ret = subsys_notif_register_notifier("modem", &mnb);
- pr_debug("subsys_register_notifier: ret1 = %p\n", ret);
- ret = subsys_notif_register_notifier("lpass", &lnb);
- pr_debug("subsys_register_notifier: ret2 = %p\n", ret);
-
- return 0;
+ subsys_notif_register_notifier("modem", &mnb);
+ subsys_notif_register_notifier("lpass", &lnb);
+ return ret;
}
late_initcall(apr_late_init);