1 files changed, 107 insertions, 155 deletions

diff --git a/sound/soc/codecs/wm8900.c b/sound/soc/codecs/wm8900.c
index 3b326c9b5586..6767de10ded0 100644
--- a/sound/soc/codecs/wm8900.c
+++ b/sound/soc/codecs/wm8900.c
@@ -138,6 +138,10 @@
 struct snd_soc_codec_device soc_codec_dev_wm8900;
 
 struct wm8900_priv {
+        struct snd_soc_codec codec;
+
+        u16 reg_cache[WM8900_MAXREG];
+
         u32 fll_in; /* FLL input frequency */
         u32 fll_out; /* FLL output frequency */
 };
@@ -727,7 +731,8 @@ static int wm8900_add_widgets(struct snd_soc_codec *codec)
 }
 
 static int wm8900_hw_params(struct snd_pcm_substream *substream,
-        struct snd_pcm_hw_params *params)
+        struct snd_pcm_hw_params *params,
+        struct snd_soc_dai *dai)
 {
         struct snd_soc_pcm_runtime *rtd = substream->private_data;
         struct snd_soc_device *socdev = rtd->socdev;
@@ -1117,8 +1122,6 @@ struct snd_soc_dai wm8900_dai = {
          },
         .ops = {
                 .hw_params = wm8900_hw_params,
-         },
-        .dai_ops = {
                  .set_clkdiv = wm8900_set_dai_clkdiv,
                  .set_pll = wm8900_set_dai_pll,
                  .set_fmt = wm8900_set_dai_fmt,
@@ -1283,16 +1286,28 @@ static int wm8900_resume(struct platform_device *pdev)
         return 0;
 }
 
-/*
- * initialise the WM8900 driver
- * register the mixer and dsp interfaces with the kernel
- */
-static int wm8900_init(struct snd_soc_device *socdev)
+static struct snd_soc_codec *wm8900_codec;
+
+static int wm8900_i2c_probe(struct i2c_client *i2c,
+                            const struct i2c_device_id *id)
 {
-        struct snd_soc_codec *codec = socdev->codec;
-        int ret = 0;
+        struct wm8900_priv *wm8900;
+        struct snd_soc_codec *codec;
         unsigned int reg;
-        struct i2c_client *i2c_client = socdev->codec->control_data;
+        int ret;
+
+        wm8900 = kzalloc(sizeof(struct wm8900_priv), GFP_KERNEL);
+        if (wm8900 == NULL)
+                return -ENOMEM;
+
+        codec = &wm8900->codec;
+        codec->private_data = wm8900;
+        codec->reg_cache = &wm8900->reg_cache[0];
+        codec->reg_cache_size = WM8900_MAXREG;
+
+        mutex_init(&codec->mutex);
+        INIT_LIST_HEAD(&codec->dapm_widgets);
+        INIT_LIST_HEAD(&codec->dapm_paths);
 
         codec->name = "WM8900";
         codec->owner = THIS_MODULE;
@@ -1300,33 +1315,28 @@ static int wm8900_init(struct snd_soc_device *socdev)
         codec->write = wm8900_write;
         codec->dai = &wm8900_dai;
         codec->num_dai = 1;
-        codec->reg_cache_size = WM8900_MAXREG;
-        codec->reg_cache = kmemdup(wm8900_reg_defaults,
-                                   sizeof(wm8900_reg_defaults), GFP_KERNEL);
-
-        if (codec->reg_cache == NULL)
-                return -ENOMEM;
+        codec->hw_write = (hw_write_t)i2c_master_send;
+        codec->control_data = i2c;
+        codec->set_bias_level = wm8900_set_bias_level;
+        codec->dev = &i2c->dev;
 
         reg = wm8900_read(codec, WM8900_REG_ID);
         if (reg != 0x8900) {
-                dev_err(&i2c_client->dev, "Device is not a WM8900 - ID %x\n",
-                        reg);
-                return -ENODEV;
-        }
-
-        codec->private_data = kzalloc(sizeof(struct wm8900_priv), GFP_KERNEL);
-        if (codec->private_data == NULL) {
-                ret = -ENOMEM;
-                goto priv_err;
+                dev_err(&i2c->dev, "Device is not a WM8900 - ID %x\n", reg);
+                ret = -ENODEV;
+                goto err;
         }
 
         /* Read back from the chip */
         reg = wm8900_chip_read(codec, WM8900_REG_POWER1);
         reg = (reg >> 12) & 0xf;
-        dev_info(&i2c_client->dev, "WM8900 revision %d\n", reg);
+        dev_info(&i2c->dev, "WM8900 revision %d\n", reg);
 
         wm8900_reset(codec);
 
+        /* Turn the chip on */
+        wm8900_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
+
         /* Latch the volume update bits */
         wm8900_write(codec, WM8900_REG_LINVOL,
                      wm8900_read(codec, WM8900_REG_LINVOL) | 0x100);
@@ -1352,160 +1362,98 @@ static int wm8900_init(struct snd_soc_device *socdev)
         /* Set the DAC and mixer output bias */
         wm8900_write(codec, WM8900_REG_OUTBIASCTL, 0x81);
 
-        /* Register pcms */
-        ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
-        if (ret < 0) {
-                dev_err(&i2c_client->dev, "Failed to register new PCMs\n");
-                goto pcm_err;
-        }
-
-        /* Turn the chip on */
-        codec->bias_level = SND_SOC_BIAS_OFF;
-        wm8900_set_bias_level(codec, SND_SOC_BIAS_STANDBY);
-
-        wm8900_add_controls(codec);
-        wm8900_add_widgets(codec);
-
-        ret = snd_soc_register_card(socdev);
-        if (ret < 0) {
-                dev_err(&i2c_client->dev, "Failed to register card\n");
-                goto card_err;
-        }
-        return ret;
-
-card_err:
-        snd_soc_free_pcms(socdev);
-        snd_soc_dapm_free(socdev);
-pcm_err:
-        kfree(codec->reg_cache);
-priv_err:
-        kfree(codec->private_data);
-        return ret;
-}
+        wm8900_dai.dev = &i2c->dev;
 
-static struct snd_soc_device *wm8900_socdev;
+        wm8900_codec = codec;
 
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
-
-static unsigned short normal_i2c[] = { 0, I2C_CLIENT_END };
-
-/* Magic definition of all other variables and things */
-I2C_CLIENT_INSMOD;
-
-static struct i2c_driver wm8900_i2c_driver;
-static struct i2c_client client_template;
-
-/* If the i2c layer weren't so broken, we could pass this kind of data
-   around */
-static int wm8900_codec_probe(struct i2c_adapter *adap, int addr, int kind)
-{
-        struct snd_soc_device *socdev = wm8900_socdev;
-        struct wm8900_setup_data *setup = socdev->codec_data;
-        struct snd_soc_codec *codec = socdev->codec;
-        struct i2c_client *i2c;
-        int ret;
-
-        if (addr != setup->i2c_address)
-                return -ENODEV;
-
-        dev_err(&adap->dev, "Probe on %x\n", addr);
-
-        client_template.adapter = adap;
-        client_template.addr = addr;
-
-        i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL);
-        if (i2c == NULL) {
-                kfree(codec);
-                return -ENOMEM;
-        }
-        i2c_set_clientdata(i2c, codec);
-        codec->control_data = i2c;
-
-        ret = i2c_attach_client(i2c);
-        if (ret < 0) {
-                dev_err(&adap->dev,
-                        "failed to attach codec at addr %x\n", addr);
+        ret = snd_soc_register_codec(codec);
+        if (ret != 0) {
+                dev_err(&i2c->dev, "Failed to register codec: %d\n", ret);
                 goto err;
         }
 
-        ret = wm8900_init(socdev);
-        if (ret < 0) {
-                dev_err(&adap->dev, "failed to initialise WM8900\n");
-                goto err;
+        ret = snd_soc_register_dai(&wm8900_dai);
+        if (ret != 0) {
+                dev_err(&i2c->dev, "Failed to register DAI: %d\n", ret);
+                goto err_codec;
         }
+
         return ret;
 
+err_codec:
+        snd_soc_unregister_codec(codec);
 err:
-        kfree(codec);
-        kfree(i2c);
+        kfree(wm8900);
+        wm8900_codec = NULL;
         return ret;
 }
 
-static int wm8900_i2c_detach(struct i2c_client *client)
+static int wm8900_i2c_remove(struct i2c_client *client)
 {
-        struct snd_soc_codec *codec = i2c_get_clientdata(client);
-        i2c_detach_client(client);
-        kfree(codec->reg_cache);
-        kfree(client);
+        snd_soc_unregister_dai(&wm8900_dai);
+        snd_soc_unregister_codec(wm8900_codec);
+
+        wm8900_set_bias_level(wm8900_codec, SND_SOC_BIAS_OFF);
+
+        wm8900_dai.dev = NULL;
+        kfree(wm8900_codec->private_data);
+        wm8900_codec = NULL;
+
         return 0;
 }
 
-static int wm8900_i2c_attach(struct i2c_adapter *adap)
-{
-        return i2c_probe(adap, &addr_data, wm8900_codec_probe);
-}
+static const struct i2c_device_id wm8900_i2c_id[] = {
+        { "wm8900", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, wm8900_i2c_id);
 
-/* corgi i2c codec control layer */
 static struct i2c_driver wm8900_i2c_driver = {
         .driver = {
-                .name = "WM8900 I2C codec",
+                .name = "WM8900",
                 .owner = THIS_MODULE,
         },
-        .attach_adapter = wm8900_i2c_attach,
-        .detach_client =  wm8900_i2c_detach,
-        .command =        NULL,
-};
-
-static struct i2c_client client_template = {
-        .name =   "WM8900",
-        .driver = &wm8900_i2c_driver,
+        .probe = wm8900_i2c_probe,
+        .remove = wm8900_i2c_remove,
+        .id_table = wm8900_i2c_id,
 };
-#endif
 
 static int wm8900_probe(struct platform_device *pdev)
 {
         struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct wm8900_setup_data *setup;
         struct snd_soc_codec *codec;
         int ret = 0;
 
-        dev_info(&pdev->dev, "WM8900 Audio Codec\n");
-
-        setup = socdev->codec_data;
-        codec = kzalloc(sizeof(struct snd_soc_codec), GFP_KERNEL);
-        if (codec == NULL)
-                return -ENOMEM;
-
-        mutex_init(&codec->mutex);
-        INIT_LIST_HEAD(&codec->dapm_widgets);
-        INIT_LIST_HEAD(&codec->dapm_paths);
+        if (!wm8900_codec) {
+                dev_err(&pdev->dev, "I2C client not yet instantiated\n");
+                return -ENODEV;
+        }
 
+        codec = wm8900_codec;
         socdev->codec = codec;
 
-        codec->set_bias_level = wm8900_set_bias_level;
+        /* Register pcms */
+        ret = snd_soc_new_pcms(socdev, SNDRV_DEFAULT_IDX1, SNDRV_DEFAULT_STR1);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "Failed to register new PCMs\n");
+                goto pcm_err;
+        }
 
-        wm8900_socdev = socdev;
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
-        if (setup->i2c_address) {
-                normal_i2c[0] = setup->i2c_address;
-                codec->hw_write = (hw_write_t)i2c_master_send;
-                ret = i2c_add_driver(&wm8900_i2c_driver);
-                if (ret != 0)
-                        printk(KERN_ERR "can't add i2c driver");
+        wm8900_add_controls(codec);
+        wm8900_add_widgets(codec);
+
+        ret = snd_soc_init_card(socdev);
+        if (ret < 0) {
+                dev_err(&pdev->dev, "Failed to register card\n");
+                goto card_err;
         }
-#else
-#error Non-I2C interfaces not yet supported
-#endif
+
+        return ret;
+
+card_err:
+        snd_soc_free_pcms(socdev);
+        snd_soc_dapm_free(socdev);
+pcm_err:
         return ret;
 }
 
@@ -1513,17 +1461,9 @@ static int wm8900_probe(struct platform_device *pdev)
 static int wm8900_remove(struct platform_device *pdev)
 {
         struct snd_soc_device *socdev = platform_get_drvdata(pdev);
-        struct snd_soc_codec *codec = socdev->codec;
-
-        if (codec->control_data)
-                wm8900_set_bias_level(codec, SND_SOC_BIAS_OFF);
 
         snd_soc_free_pcms(socdev);
         snd_soc_dapm_free(socdev);
-#if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
-        i2c_del_driver(&wm8900_i2c_driver);
-#endif
-        kfree(codec);
 
         return 0;
 }
@@ -1536,6 +1476,18 @@ struct snd_soc_codec_device soc_codec_dev_wm8900 = {
 };
 EXPORT_SYMBOL_GPL(soc_codec_dev_wm8900);
 
+static int __init wm8900_modinit(void)
+{
+        return i2c_add_driver(&wm8900_i2c_driver);
+}
+module_init(wm8900_modinit);
+
+static void __exit wm8900_exit(void)
+{
+        i2c_del_driver(&wm8900_i2c_driver);
+}
+module_exit(wm8900_exit);
+
 MODULE_DESCRIPTION("ASoC WM8900 driver");
 MODULE_AUTHOR("Mark Brown <broonie@opensource.wolfonmicro.com>");
 MODULE_LICENSE("GPL");