1 files changed, 12 insertions, 13 deletions

diff --git a/sound/soc/codecs/wm8731.c b/sound/soc/codecs/wm8731.c
index 76b4361e9b80..7e5ec03f6f8d 100644
--- a/sound/soc/codecs/wm8731.c
+++ b/sound/soc/codecs/wm8731.c
@@ -22,6 +22,7 @@
 #include <linux/platform_device.h>
 #include <linux/regulator/consumer.h>
 #include <linux/spi/spi.h>
+#include <linux/of_device.h>
 #include <sound/core.h>
 #include <sound/pcm.h>
 #include <sound/pcm_params.h>
@@ -426,9 +427,7 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec,
                                  enum snd_soc_bias_level level)
 {
         struct wm8731_priv *wm8731 = snd_soc_codec_get_drvdata(codec);
-        int i, ret;
-        u8 data[2];
-        u16 *cache = codec->reg_cache;
+        int ret;
         u16 reg;
 
         switch (level) {
@@ -443,16 +442,7 @@ static int wm8731_set_bias_level(struct snd_soc_codec *codec,
                         if (ret != 0)
                                 return ret;
 
-                        /* Sync reg_cache with the hardware */
-                        for (i = 0; i < ARRAY_SIZE(wm8731_reg); i++) {
-                                if (cache[i] == wm8731_reg[i])
-                                        continue;
-
-                                data[0] = (i << 1) | ((cache[i] >> 8)
-                                                      & 0x0001);
-                                data[1] = cache[i] & 0x00ff;
-                                codec->hw_write(codec->control_data, data, 2);
-                        }
+                        snd_soc_cache_sync(codec);
                 }
 
                 /* Clear PWROFF, gate CLKOUT, everything else as-is */
@@ -607,6 +597,13 @@ static struct snd_soc_codec_driver soc_codec_dev_wm8731 = {
         .num_dapm_routes = ARRAY_SIZE(wm8731_intercon),
 };
 
+static const struct of_device_id wm8731_of_match[] = {
+        { .compatible = "wlf,wm8731", },
+        { }
+};
+
+MODULE_DEVICE_TABLE(of, wm8731_of_match);
+
 #if defined(CONFIG_SPI_MASTER)
 static int __devinit wm8731_spi_probe(struct spi_device *spi)
 {
@@ -638,6 +635,7 @@ static struct spi_driver wm8731_spi_driver = {
         .driver = {
                 .name   = "wm8731",
                 .owner  = THIS_MODULE,
+                .of_match_table = wm8731_of_match,
         },
         .probe          = wm8731_spi_probe,
         .remove         = __devexit_p(wm8731_spi_remove),
@@ -682,6 +680,7 @@ static struct i2c_driver wm8731_i2c_driver = {
         .driver = {
                 .name = "wm8731",
                 .owner = THIS_MODULE,
+                .of_match_table = wm8731_of_match,
         },
         .probe =    wm8731_i2c_probe,
         .remove =   __devexit_p(wm8731_i2c_remove),