1 files changed, 6 insertions, 16 deletions

diff --git a/sound/soc/codecs/ak4671.c b/sound/soc/codecs/ak4671.c
index 88b29f8c748b..de9ff66d3721 100644
--- a/sound/soc/codecs/ak4671.c
+++ b/sound/soc/codecs/ak4671.c
@@ -26,7 +26,6 @@
 /* codec private data */
 struct ak4671_priv {
         enum snd_soc_control_type control_type;
-        void *control_data;
 };
 
 /* ak4671 register cache & default register settings */
@@ -169,18 +168,15 @@ static int ak4671_out2_event(struct snd_soc_dapm_widget *w,
                 struct snd_kcontrol *kcontrol, int event)
 {
         struct snd_soc_codec *codec = w->codec;
-        u8 reg;
 
         switch (event) {
         case SND_SOC_DAPM_POST_PMU:
-                reg = snd_soc_read(codec, AK4671_LOUT2_POWER_MANAGERMENT);
-                reg |= AK4671_MUTEN;
-                snd_soc_write(codec, AK4671_LOUT2_POWER_MANAGERMENT, reg);
+                snd_soc_update_bits(codec, AK4671_LOUT2_POWER_MANAGERMENT,
+                                    AK4671_MUTEN, AK4671_MUTEN);
                 break;
         case SND_SOC_DAPM_PRE_PMD:
-                reg = snd_soc_read(codec, AK4671_LOUT2_POWER_MANAGERMENT);
-                reg &= ~AK4671_MUTEN;
-                snd_soc_write(codec, AK4671_LOUT2_POWER_MANAGERMENT, reg);
+                snd_soc_update_bits(codec, AK4671_LOUT2_POWER_MANAGERMENT,
+                                    AK4671_MUTEN, 0);
                 break;
         }
 
@@ -576,15 +572,12 @@ static int ak4671_set_dai_fmt(struct snd_soc_dai *dai, unsigned int fmt)
 static int ak4671_set_bias_level(struct snd_soc_codec *codec,
                 enum snd_soc_bias_level level)
 {
-        u8 reg;
-
         switch (level) {
         case SND_SOC_BIAS_ON:
         case SND_SOC_BIAS_PREPARE:
         case SND_SOC_BIAS_STANDBY:
-                reg = snd_soc_read(codec, AK4671_AD_DA_POWER_MANAGEMENT);
-                snd_soc_write(codec, AK4671_AD_DA_POWER_MANAGEMENT,
-                                reg | AK4671_PMVCM);
+                snd_soc_update_bits(codec, AK4671_AD_DA_POWER_MANAGEMENT,
+                                    AK4671_PMVCM, AK4671_PMVCM);
                 break;
         case SND_SOC_BIAS_OFF:
                 snd_soc_write(codec, AK4671_AD_DA_POWER_MANAGEMENT, 0x00);
@@ -629,8 +622,6 @@ static int ak4671_probe(struct snd_soc_codec *codec)
         struct ak4671_priv *ak4671 = snd_soc_codec_get_drvdata(codec);
         int ret;
 
-        codec->hw_write = (hw_write_t)i2c_master_send;
-
         ret = snd_soc_codec_set_cache_io(codec, 8, 8, ak4671->control_type);
         if (ret < 0) {
                 dev_err(codec->dev, "Failed to set cache I/O: %d\n", ret);
@@ -675,7 +666,6 @@ static int __devinit ak4671_i2c_probe(struct i2c_client *client,
                 return -ENOMEM;
 
         i2c_set_clientdata(client, ak4671);
-        ak4671->control_data = client;
         ak4671->control_type = SND_SOC_I2C;
 
         ret = snd_soc_register_codec(&client->dev,