1 files changed, 24 insertions, 36 deletions

diff --git a/sound/soc/codecs/wm8903.c b/sound/soc/codecs/wm8903.c
index bde74546db4a..8cf571f1a803 100644
--- a/sound/soc/codecs/wm8903.c
+++ b/sound/soc/codecs/wm8903.c
@@ -744,21 +744,6 @@ SOC_DOUBLE_R_TLV("Speaker Volume",
                  0, 63, 0, out_tlv),
 };
 
-static int wm8903_add_controls(struct snd_soc_codec *codec)
-{
-        int err, i;
-
-        for (i = 0; i < ARRAY_SIZE(wm8903_snd_controls); i++) {
-                err = snd_ctl_add(codec->card,
-                                  snd_soc_cnew(&wm8903_snd_controls[i],
-                                               codec, NULL));
-                if (err < 0)
-                        return err;
-        }
-
-        return 0;
-}
-
 static const struct snd_kcontrol_new linput_mode_mux =
         SOC_DAPM_ENUM("Left Input Mode Mux", linput_mode_enum);
 
@@ -1276,7 +1261,7 @@ static int wm8903_startup(struct snd_pcm_substream *substream,
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_device *socdev = rtd->socdev;
-        struct snd_soc_codec *codec = socdev->codec;
+        struct snd_soc_codec *codec = socdev->card->codec;
         struct wm8903_priv *wm8903 = codec->private_data;
         struct i2c_client *i2c = codec->control_data;
         struct snd_pcm_runtime *master_runtime;
@@ -1318,7 +1303,7 @@ static void wm8903_shutdown(struct snd_pcm_substream *substream,
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_device *socdev = rtd->socdev;
-        struct snd_soc_codec *codec = socdev->codec;
+        struct snd_soc_codec *codec = socdev->card->codec;
         struct wm8903_priv *wm8903 = codec->private_data;
 
         if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
@@ -1338,7 +1323,7 @@ static int wm8903_hw_params(struct snd_pcm_substream *substream,
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_device *socdev = rtd->socdev;
-        struct snd_soc_codec *codec = socdev->codec;
+        struct snd_soc_codec *codec = socdev->card->codec;
         struct wm8903_priv *wm8903 = codec->private_data;
         struct i2c_client *i2c = codec->control_data;
         int fs = params_rate(params);
@@ -1512,6 +1497,15 @@ static int wm8903_hw_params(struct snd_pcm_substream *substream,
                         SNDRV_PCM_FMTBIT_S20_3LE |\
                         SNDRV_PCM_FMTBIT_S24_LE)
 
+static struct snd_soc_dai_ops wm8903_dai_ops = {
+        .startup        = wm8903_startup,
+        .shutdown       = wm8903_shutdown,
+        .hw_params      = wm8903_hw_params,
+        .digital_mute   = wm8903_digital_mute,
+        .set_fmt        = wm8903_set_dai_fmt,
+        .set_sysclk     = wm8903_set_dai_sysclk,
+};
+
 struct snd_soc_dai wm8903_dai = {
         .name = "WM8903",
         .playback = {
@@ -1528,21 +1522,14 @@ struct snd_soc_dai wm8903_dai = {
                  .rates = WM8903_CAPTURE_RATES,
                  .formats = WM8903_FORMATS,
          },
-        .ops = {
-                 .startup = wm8903_startup,
-                 .shutdown = wm8903_shutdown,
-                 .hw_params = wm8903_hw_params,
-                 .digital_mute = wm8903_digital_mute,
-                 .set_fmt = wm8903_set_dai_fmt,
-                 .set_sysclk = wm8903_set_dai_sysclk
-        }
+        .ops = &wm8903_dai_ops,
 };
 EXPORT_SYMBOL_GPL(wm8903_dai);
 
 static int wm8903_suspend(struct platform_device *pdev, pm_message_t state)
 {
         struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec = socdev->codec;
+        struct snd_soc_codec *codec = socdev->card->codec;
 
         wm8903_set_bias_level(codec, SND_SOC_BIAS_OFF);
 
@@ -1552,7 +1539,7 @@ static int wm8903_suspend(struct platform_device *pdev, pm_message_t state)
 static int wm8903_resume(struct platform_device *pdev)
 {
         struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec = socdev->codec;
+        struct snd_soc_codec *codec = socdev->card->codec;
         struct i2c_client *i2c = codec->control_data;
         int i;
         u16 *reg_cache = codec->reg_cache;
@@ -1577,8 +1564,8 @@ static int wm8903_resume(struct platform_device *pdev)
 
 static struct snd_soc_codec *wm8903_codec;
 
-static int wm8903_i2c_probe(struct i2c_client *i2c,
-                            const struct i2c_device_id *id)
+static __devinit int wm8903_i2c_probe(struct i2c_client *i2c,
+                                      const struct i2c_device_id *id)
 {
         struct wm8903_priv *wm8903;
         struct snd_soc_codec *codec;
@@ -1684,7 +1671,7 @@ err:
         return ret;
 }
 
-static int wm8903_i2c_remove(struct i2c_client *client)
+static __devexit int wm8903_i2c_remove(struct i2c_client *client)
 {
         struct snd_soc_codec *codec = i2c_get_clientdata(client);
 
@@ -1714,7 +1701,7 @@ static struct i2c_driver wm8903_i2c_driver = {
                 .owner = THIS_MODULE,
         },
         .probe    = wm8903_i2c_probe,
-        .remove   = wm8903_i2c_remove,
+        .remove   = __devexit_p(wm8903_i2c_remove),
         .id_table = wm8903_i2c_id,
 };
 
@@ -1728,7 +1715,7 @@ static int wm8903_probe(struct platform_device *pdev)
                 goto err;
         }
 
-        socdev->codec = wm8903_codec;
+        socdev->card->codec = wm8903_codec;
 
         /* register pcms */
         ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
@@ -1737,8 +1724,9 @@ static int wm8903_probe(struct platform_device *pdev)
                 goto err;
         }
 
-        wm8903_add_controls(socdev->codec);
-        wm8903_add_widgets(socdev->codec);
+        snd_soc_add_controls(socdev->card->codec, wm8903_snd_controls,
+                                ARRAY_SIZE(wm8903_snd_controls));
+        wm8903_add_widgets(socdev->card->codec);
 
         ret = snd_soc_init_card(socdev);
         if (ret < 0) {
@@ -1759,7 +1747,7 @@ err:
 static int wm8903_remove(struct platform_device *pdev)
 {
         struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec = socdev->codec;
+        struct snd_soc_codec *codec = socdev->card->codec;
 
         if (codec->control_data)
                 wm8903_set_bias_level(codec, SND_SOC_BIAS_OFF);