commit f98bbd0f10d96f675495271c24fa20ed09925492
author Vidyakumar Athota <vathota@codeaurora.org> Fri Dec 04 15:51:21 2015 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Tue Jan 05 18:44:46 2016 -0800
tree e48b420252a23f84f624651d40057b32c2c3676d
parent 54ae37c97256e3233cd015c3b5519c2398213bc1

hal: spk_prot: remove speaker thermal zone name check

Remove unnecessary speaker thermal zone name check in
set parameters. This is required to provide the flexibility
of swapping left and right speakers.

Change-Id: Id88aad98c392fe08744cd3380fe2b1d9d2affeb7

hal/audio_extn/spkr_protection.c

diff --git a/hal/audio_extn/spkr_protection.c b/hal/audio_extn/spkr_protection.c
index b925fbe..53cca7d 100644
--- a/hal/audio_extn/spkr_protection.c
+++ b/hal/audio_extn/spkr_protection.c
@@ -103,12 +103,6 @@
 #define AUDIO_PARAMETER_KEY_SPKR_TZ_1     "spkr_1_tz_name"
 #define AUDIO_PARAMETER_KEY_SPKR_TZ_2     "spkr_2_tz_name"
 
-#define SPKR_TZ_1    "wsatz.12"
-#define SPKR_TZ_2    "wsatz.11"
-#define SPKR_TZ_3    "wsatz.14"
-#define SPKR_TZ_4    "wsatz.13"
-
-
 /*Modes of Speaker Protection*/
 enum speaker_protection_mode {
     SPKR_PROTECTION_DISABLED = -1,
@@ -953,18 +947,14 @@
     err = str_parms_get_str(parms, AUDIO_PARAMETER_KEY_SPKR_TZ_1,
                             value, len);
     if (err >= 0) {
-        if ((!strncmp(SPKR_TZ_1, value, sizeof(SPKR_TZ_1)) ||
-            (!strncmp(SPKR_TZ_3, value, sizeof(SPKR_TZ_3)))))
-            tz_names.spkr_1_name = strdup(value);
+        tz_names.spkr_1_name = strdup(value);
         str_parms_del(parms, AUDIO_PARAMETER_KEY_SPKR_TZ_1);
     }
 
     err = str_parms_get_str(parms, AUDIO_PARAMETER_KEY_SPKR_TZ_2,
                             value, len);
     if (err >= 0) {
-        if ((!strncmp(SPKR_TZ_2, value, sizeof(SPKR_TZ_2)) ||
-            (!strncmp(SPKR_TZ_4, value, sizeof(SPKR_TZ_4)))))
-            tz_names.spkr_2_name = strdup(value);
+        tz_names.spkr_2_name = strdup(value);
         str_parms_del(parms, AUDIO_PARAMETER_KEY_SPKR_TZ_2);
     }