commit 07a889328f7617e3c49a96ea219aa76bae15e0bc
author David Lin <dtwlin@google.com> Fri Mar 02 19:34:00 2018 -0800
committer David Lin <dtwlin@google.com> Fri Mar 02 19:34:00 2018 -0800
tree bea231cd242bfa8af940920bd719b69948cf48a4
parent e6e2d441c567d5da185b787d6c10ca2c8b36a694

hal: cirrus_playback: remove workaround for b1 p1.0

This removes workaround that was needed to disable speaker protection
for B1 P1.0 devices.

Bug: 73728452
Test: manual audio test
Change-Id: Ifd54b0e534296e0fbcebae16a9a79f69a98983ec
Signed-off-by: David Lin <dtwlin@google.com>

hal/audio_extn/cirrus_playback.c

diff --git a/hal/audio_extn/cirrus_playback.c b/hal/audio_extn/cirrus_playback.c
index 3fa6066..18513af 100644
--- a/hal/audio_extn/cirrus_playback.c
+++ b/hal/audio_extn/cirrus_playback.c
@@ -43,7 +43,6 @@
     pthread_t calibration_thread;
     struct pcm *pcm_rx;
     struct pcm *pcm_tx;
-    bool spkr_prot_enable;
 };
 
 struct crus_sp_ioctl_header {
@@ -421,14 +420,6 @@
 
     snd_split_handle = audio_extn_get_snd_card_split();
 
-    /* FIXME: REMOVE THIS AFTER B1C1 P1.0 SUPPORT */
-    if (!strcmp(snd_split_handle->form_factor, "tdm") ||
-        !strcmp(snd_split_handle->form_factor, "c1")) {
-        handle.spkr_prot_enable = true;
-    } else {
-        handle.spkr_prot_enable = false;
-    }
-
     handle.adev_handle = adev;
 
     pthread_mutex_init(&handle.fb_prot_mutex, NULL);
@@ -553,7 +544,7 @@
 }
 
 bool audio_extn_spkr_prot_is_enabled() {
-    return handle.spkr_prot_enable;
+    return true;
 }
 
 int audio_extn_spkr_prot_get_acdb_id(snd_device_t snd_device) {