Merge branch 'topic/section-fix' into for-linus

[pandora-kernel.git] / sound / ppc / keywest.c

diff --git a/sound/ppc/keywest.c b/sound/ppc/keywest.c
index 6ff99ed..835fa19 100644 (file)
--- a/sound/ppc/keywest.c
+++ b/sound/ppc/keywest.c
@@ -33,73 +33,69 @@
 static struct pmac_keywest *keywest_ctx;
 
 
-static int keywest_attach_adapter(struct i2c_adapter *adapter);
-static int keywest_detach_client(struct i2c_client *client);
-
-struct i2c_driver keywest_driver = {  
-       .driver = {
-               .name = "PMac Keywest Audio",
-       },
-       .attach_adapter = &keywest_attach_adapter,
-       .detach_client = &keywest_detach_client,
-};
-
-
-#ifndef i2c_device_name
-#define i2c_device_name(x)     ((x)->name)
-#endif
+static int keywest_probe(struct i2c_client *client,
+                        const struct i2c_device_id *id)
+{
+       i2c_set_clientdata(client, keywest_ctx);
+       return 0;
+}
 
+/*
+ * This is kind of a hack, best would be to turn powermac to fixed i2c
+ * bus numbers and declare the sound device as part of platform
+ * initialization
+ */
 static int keywest_attach_adapter(struct i2c_adapter *adapter)
 {
-       int err;
-       struct i2c_client *new_client;
+       struct i2c_board_info info;
 
        if (! keywest_ctx)
                return -EINVAL;
 
-       if (strncmp(i2c_device_name(adapter), "mac-io", 6))
+       if (strncmp(adapter->name, "mac-io", 6))
                return 0; /* ignored */
 
-       new_client = kzalloc(sizeof(struct i2c_client), GFP_KERNEL);
-       if (! new_client)
-               return -ENOMEM;
-
-       new_client->addr = keywest_ctx->addr;
-       i2c_set_clientdata(new_client, keywest_ctx);
-       new_client->adapter = adapter;
-       new_client->driver = &keywest_driver;
-       new_client->flags = 0;
-
-       strcpy(i2c_device_name(new_client), keywest_ctx->name);
-       keywest_ctx->client = new_client;
+       memset(&info, 0, sizeof(struct i2c_board_info));
+       strlcpy(info.type, "keywest", I2C_NAME_SIZE);
+       info.addr = keywest_ctx->addr;
+       keywest_ctx->client = i2c_new_device(adapter, &info);
        
-       /* Tell the i2c layer a new client has arrived */
-       if (i2c_attach_client(new_client)) {
-               snd_printk(KERN_ERR "tumbler: cannot attach i2c client\n");
-               err = -ENODEV;
-               goto __err;
-       }
-
+       /*
+        * Let i2c-core delete that device on driver removal.
+        * This is safe because i2c-core holds the core_lock mutex for us.
+        */
+       list_add_tail(&keywest_ctx->client->detected,
+                     &keywest_ctx->client->driver->clients);
        return 0;
-
- __err:
-       kfree(new_client);
-       keywest_ctx->client = NULL;
-       return err;
 }
 
-static int keywest_detach_client(struct i2c_client *client)
+static int keywest_remove(struct i2c_client *client)
 {
+       i2c_set_clientdata(client, NULL);
        if (! keywest_ctx)
                return 0;
        if (client == keywest_ctx->client)
                keywest_ctx->client = NULL;
 
-       i2c_detach_client(client);
-       kfree(client);
        return 0;
 }
 
+
+static const struct i2c_device_id keywest_i2c_id[] = {
+       { "keywest", 0 },
+       { }
+};
+
+struct i2c_driver keywest_driver = {
+       .driver = {
+               .name = "PMac Keywest Audio",
+       },
+       .attach_adapter = keywest_attach_adapter,
+       .probe = keywest_probe,
+       .remove = keywest_remove,
+       .id_table = keywest_i2c_id,
+};
+
 /* exported */
 void snd_pmac_keywest_cleanup(struct pmac_keywest *i2c)
 {
@@ -109,7 +105,7 @@ void snd_pmac_keywest_cleanup(struct pmac_keywest *i2c)
        }
 }
 
-int __init snd_pmac_tumbler_post_init(void)
+int __devinit snd_pmac_tumbler_post_init(void)
 {
        int err;
        
@@ -124,7 +120,7 @@ int __init snd_pmac_tumbler_post_init(void)
 }
 
 /* exported */
-int __init snd_pmac_keywest_init(struct pmac_keywest *i2c)
+int __devinit snd_pmac_keywest_init(struct pmac_keywest *i2c)
 {
        int err;