1 files changed, 12 insertions, 16 deletions

diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index d015745a886..987476a5895 100644
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -31,6 +31,7 @@
 #include <sound/soc.h>
 #include <sound/initval.h>
 #include <sound/wm8903.h>
+#include <trace/events/asoc.h>
 
 #include "wm8903.h"
 
@@ -213,8 +214,6 @@ static u16 wm8903_reg_defaults[] = {
 
 struct wm8903_priv {
 
-        u16 reg_cache[ARRAY_SIZE(wm8903_reg_defaults)];
-
         int sysclk;
         int irq;
 
@@ -1013,7 +1012,7 @@ static int wm8903_add_widgets(struct snd_soc_codec *codec)
 static int wm8903_set_bias_level(struct snd_soc_codec *codec,
                                  enum snd_soc_bias_level level)
 {
-        u16 reg, reg2;
+        u16 reg;
 
         switch (level) {
         case SND_SOC_BIAS_ON:
@@ -1037,23 +1036,15 @@ static int wm8903_set_bias_level(struct snd_soc_codec *codec,
                         wm8903_run_sequence(codec, 0);
                         wm8903_sync_reg_cache(codec, codec->reg_cache);
 
-                        /* Enable low impedence charge pump output */
-                        reg = snd_soc_read(codec,
-                                          WM8903_CONTROL_INTERFACE_TEST_1);
-                        snd_soc_write(codec, WM8903_CONTROL_INTERFACE_TEST_1,
-                                     reg | WM8903_TEST_KEY);
-                        reg2 = snd_soc_read(codec, WM8903_CHARGE_PUMP_TEST_1);
-                        snd_soc_write(codec, WM8903_CHARGE_PUMP_TEST_1,
-                                     reg2 | WM8903_CP_SW_KELVIN_MODE_MASK);
-                        snd_soc_write(codec, WM8903_CONTROL_INTERFACE_TEST_1,
-                                     reg);
-
                         /* By default no bypass paths are enabled so
                          * enable Class W support.
                          */
                         dev_dbg(codec->dev, "Enabling Class W\n");
-                        snd_soc_write(codec, WM8903_CLASS_W_0, reg |
-                                     WM8903_CP_DYN_FREQ | WM8903_CP_DYN_V);
+                        snd_soc_update_bits(codec, WM8903_CLASS_W_0,
+                                            WM8903_CP_DYN_FREQ |
+                                            WM8903_CP_DYN_V,
+                                            WM8903_CP_DYN_FREQ |
+                                            WM8903_CP_DYN_V);
                 }
 
                 reg = snd_soc_read(codec, WM8903_VMID_CONTROL_0);
@@ -1533,6 +1524,11 @@ static irqreturn_t wm8903_irq(int irq, void *data)
         mic_report = wm8903->mic_last_report;
         int_pol = snd_soc_read(codec, WM8903_INTERRUPT_POLARITY_1);
 
+#ifndef CONFIG_SND_SOC_WM8903_MODULE
+        if (int_val & (WM8903_MICSHRT_EINT | WM8903_MICDET_EINT))
+                trace_snd_soc_jack_irq(dev_name(codec->dev));
+#endif
+
         if (int_val & WM8903_MICSHRT_EINT) {
                 dev_dbg(codec->dev, "Microphone short (pol=%x)\n", int_pol);