2 files changed, 54 insertions, 57 deletions

diff --git a/sound/soc/codecs/ak4535.c b/sound/soc/codecs/ak4535.c
index 7da9f467b7b8..e512cd79d767 100644
--- a/sound/soc/codecs/ak4535.c
+++ b/sound/soc/codecs/ak4535.c
@@ -535,87 +535,85 @@ static struct snd_soc_device *ak4535_socdev;
 
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
 
-#define I2C_DRIVERID_AK4535 0xfefe /* liam -  need a proper id */
-
-static unsigned short normal_i2c[] = { 0, I2C_CLIENT_END };
-
-/* Magic definition of all other variables and things */
-I2C_CLIENT_INSMOD;
-
-static struct i2c_driver ak4535_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 ak4535_codec_probe(struct i2c_adapter *adap, int addr, int kind)
+static int ak4535_i2c_probe(struct i2c_client *i2c,
+                            const struct i2c_device_id *id)
 {
         struct snd_soc_device *socdev = ak4535_socdev;
-        struct ak4535_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;
-
-        client_template.adapter = adap;
-        client_template.addr = addr;
-
-        i2c = kmemdup(&client_template, sizeof(client_template), GFP_KERNEL);
-        if (i2c == NULL)
-                return -ENOMEM;
-
         i2c_set_clientdata(i2c, codec);
         codec->control_data = i2c;
 
-        ret = i2c_attach_client(i2c);
-        if (ret < 0) {
-                printk(KERN_ERR "failed to attach codec at addr %x\n", addr);
-                goto err;
-        }
-
         ret = ak4535_init(socdev);
-        if (ret < 0) {
+        if (ret < 0)
                 printk(KERN_ERR "failed to initialise AK4535\n");
-                goto err;
-        }
-        return ret;
 
-err:
-        kfree(i2c);
         return ret;
 }
 
-static int ak4535_i2c_detach(struct i2c_client *client)
+static int ak4535_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);
         return 0;
 }
 
-static int ak4535_i2c_attach(struct i2c_adapter *adap)
-{
-        return i2c_probe(adap, &addr_data, ak4535_codec_probe);
-}
+static const struct i2c_device_id ak4535_i2c_id[] = {
+        { "ak4535", 0 },
+        { }
+};
+MODULE_DEVICE_TABLE(i2c, ak4535_i2c_id);
 
-/* corgi i2c codec control layer */
 static struct i2c_driver ak4535_i2c_driver = {
         .driver = {
                 .name = "AK4535 I2C Codec",
                 .owner = THIS_MODULE,
         },
-        .id =             I2C_DRIVERID_AK4535,
-        .attach_adapter = ak4535_i2c_attach,
-        .detach_client =  ak4535_i2c_detach,
-        .command =        NULL,
+        .probe =    ak4535_i2c_probe,
+        .remove =   ak4535_i2c_remove,
+        .id_table = ak4535_i2c_id,
 };
 
-static struct i2c_client client_template = {
-        .name =   "AK4535",
-        .driver = &ak4535_i2c_driver,
-};
+static int ak4535_add_i2c_device(struct platform_device *pdev,
+                                 const struct ak4535_setup_data *setup)
+{
+        struct i2c_board_info info;
+        struct i2c_adapter *adapter;
+        struct i2c_client *client;
+        int ret;
+
+        ret = i2c_add_driver(&ak4535_i2c_driver);
+        if (ret != 0) {
+                dev_err(&pdev->dev, "can't add i2c driver\n");
+                return ret;
+        }
+
+        memset(&info, 0, sizeof(struct i2c_board_info));
+        info.addr = setup->i2c_address;
+        strlcpy(info.type, "ak4535", I2C_NAME_SIZE);
+
+        adapter = i2c_get_adapter(setup->i2c_bus);
+        if (!adapter) {
+                dev_err(&pdev->dev, "can't get i2c adapter %d\n",
+                        setup->i2c_bus);
+                goto err_driver;
+        }
+
+        client = i2c_new_device(adapter, &info);
+        i2c_put_adapter(adapter);
+        if (!client) {
+                dev_err(&pdev->dev, "can't add i2c device at 0x%x\n",
+                        (unsigned int)info.addr);
+                goto err_driver;
+        }
+
+        return 0;
+
+err_driver:
+        i2c_del_driver(&ak4535_i2c_driver);
+        return -ENODEV;
+}
 #endif
 
 static int ak4535_probe(struct platform_device *pdev)
@@ -648,12 +646,9 @@ static int ak4535_probe(struct platform_device *pdev)
         ak4535_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;
                 codec->hw_read = (hw_read_t)i2c_master_recv;
-                ret = i2c_add_driver(&ak4535_i2c_driver);
-                if (ret != 0)
-                        printk(KERN_ERR "can't add i2c driver");
+                ret = ak4535_add_i2c_device(pdev, setup);
         }
 #else
         /* Add other interfaces here */
@@ -678,6 +673,7 @@ static int ak4535_remove(struct platform_device *pdev)
         snd_soc_free_pcms(socdev);
         snd_soc_dapm_free(socdev);
 #if defined(CONFIG_I2C) || defined(CONFIG_I2C_MODULE)
+        i2c_unregister_device(codec->control_data);
         i2c_del_driver(&ak4535_i2c_driver);
 #endif
         kfree(codec->private_data);
diff --git a/sound/soc/codecs/ak4535.h b/sound/soc/codecs/ak4535.h
index e9fe30e2c056..c7a58703ea39 100644
--- a/sound/soc/codecs/ak4535.h
+++ b/sound/soc/codecs/ak4535.h
@@ -37,6 +37,7 @@
 #define AK4535_CACHEREGNUM      0x10
 
 struct ak4535_setup_data {
+        int            i2c_bus;
         unsigned short i2c_address;
 };