12 files changed, 43 insertions, 32 deletions

diff --git a/sound/aoa/fabrics/layout.c b/sound/aoa/fabrics/layout.c
index 1cd9b301df03..3fd1a7e24928 100644
--- a/sound/aoa/fabrics/layout.c
+++ b/sound/aoa/fabrics/layout.c
@@ -992,7 +992,7 @@ static int aoa_fabric_layout_probe(struct soundbus_dev *sdev)
                 return -ENODEV;
 
         /* by breaking out we keep a reference */
-        while ((sound = of_get_next_child(sdev->ofdev.node, sound))) {
+        while ((sound = of_get_next_child(sdev->ofdev.dev.of_node, sound))) {
                 if (sound->type && strcasecmp(sound->type, "soundchip") == 0)
                         break;
         }
diff --git a/sound/aoa/soundbus/core.c b/sound/aoa/soundbus/core.c
index fa8ab2815a98..99ca7120e269 100644
--- a/sound/aoa/soundbus/core.c
+++ b/sound/aoa/soundbus/core.c
@@ -74,11 +74,11 @@ static int soundbus_uevent(struct device *dev, struct kobj_uevent_env *env)
         of = &soundbus_dev->ofdev;
 
         /* stuff we want to pass to /sbin/hotplug */
-        retval = add_uevent_var(env, "OF_NAME=%s", of->node->name);
+        retval = add_uevent_var(env, "OF_NAME=%s", of->dev.of_node->name);
         if (retval)
                 return retval;
 
-        retval = add_uevent_var(env, "OF_TYPE=%s", of->node->type);
+        retval = add_uevent_var(env, "OF_TYPE=%s", of->dev.of_node->type);
         if (retval)
                 return retval;
 
@@ -86,7 +86,7 @@ static int soundbus_uevent(struct device *dev, struct kobj_uevent_env *env)
          * it's not really legal to split it out with commas. We split it
          * up using a number of environment variables instead. */
 
-        compat = of_get_property(of->node, "compatible", &cplen);
+        compat = of_get_property(of->dev.of_node, "compatible", &cplen);
         while (compat && cplen > 0) {
                 int tmp = env->buflen;
                 retval = add_uevent_var(env, "OF_COMPATIBLE_%d=%s", seen, compat);
@@ -169,7 +169,7 @@ int soundbus_add_one(struct soundbus_dev *dev)
 
         /* sanity checks */
         if (!dev->attach_codec ||
-            !dev->ofdev.node ||
+            !dev->ofdev.dev.of_node ||
             dev->pcmname ||
             dev->pcmid != -1) {
                 printk(KERN_ERR "soundbus: adding device failed sanity check!\n");
diff --git a/sound/aoa/soundbus/i2sbus/control.c b/sound/aoa/soundbus/i2sbus/control.c
index 47f854c2001f..4dc9b49c02cf 100644
--- a/sound/aoa/soundbus/i2sbus/control.c
+++ b/sound/aoa/soundbus/i2sbus/control.c
@@ -42,7 +42,7 @@ int i2sbus_control_add_dev(struct i2sbus_control *c,
 {
         struct device_node *np;
 
-        np = i2sdev->sound.ofdev.node;
+        np = i2sdev->sound.ofdev.dev.of_node;
         i2sdev->enable = pmf_find_function(np, "enable");
         i2sdev->cell_enable = pmf_find_function(np, "cell-enable");
         i2sdev->clock_enable = pmf_find_function(np, "clock-enable");
diff --git a/sound/aoa/soundbus/i2sbus/core.c b/sound/aoa/soundbus/i2sbus/core.c
index 9d6f3b176ed1..678933721735 100644
--- a/sound/aoa/soundbus/i2sbus/core.c
+++ b/sound/aoa/soundbus/i2sbus/core.c
@@ -221,9 +221,9 @@ static int i2sbus_add_dev(struct macio_dev *macio,
 
         mutex_init(&dev->lock);
         spin_lock_init(&dev->low_lock);
-        dev->sound.ofdev.node = np;
-        dev->sound.ofdev.dma_mask = macio->ofdev.dma_mask;
-        dev->sound.ofdev.dev.dma_mask = &dev->sound.ofdev.dma_mask;
+        dev->sound.ofdev.archdata.dma_mask = macio->ofdev.archdata.dma_mask;
+        dev->sound.ofdev.dev.of_node = np;
+        dev->sound.ofdev.dev.dma_mask = &dev->sound.ofdev.archdata.dma_mask;
         dev->sound.ofdev.dev.parent = &macio->ofdev.dev;
         dev->sound.ofdev.dev.release = i2sbus_release_dev;
         dev->sound.attach_codec = i2sbus_attach_codec;
@@ -346,7 +346,7 @@ static int i2sbus_probe(struct macio_dev* dev, const struct of_device_id *match)
                 return -ENODEV;
         }
 
-        while ((np = of_get_next_child(dev->ofdev.node, np))) {
+        while ((np = of_get_next_child(dev->ofdev.dev.of_node, np))) {
                 if (of_device_is_compatible(np, "i2sbus") ||
                     of_device_is_compatible(np, "i2s-modem")) {
                         got += i2sbus_add_dev(dev, control, np);
diff --git a/sound/aoa/soundbus/sysfs.c b/sound/aoa/soundbus/sysfs.c
index f580942b5c09..6496e754f00a 100644
--- a/sound/aoa/soundbus/sysfs.c
+++ b/sound/aoa/soundbus/sysfs.c
@@ -9,7 +9,7 @@ field##_show (struct device *dev, struct device_attribute *attr,	\
               char *buf)                                                \
 {                                                                       \
         struct soundbus_dev *mdev = to_soundbus_device (dev);           \
-        return sprintf (buf, format_string, mdev->ofdev.node->field);   \
+        return sprintf (buf, format_string, mdev->ofdev.dev.of_node->field); \
 }
 
 static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
@@ -25,7 +25,7 @@ static ssize_t modalias_show(struct device *dev, struct device_attribute *attr,
                 length = strlen(buf);
         } else {
                 length = sprintf(buf, "of:N%sT%s\n",
-                                 of->node->name, of->node->type);
+                                 of->dev.of_node->name, of->dev.of_node->type);
         }
 
         return length;
diff --git a/sound/soc/fsl/mpc5200_dma.c b/sound/soc/fsl/mpc5200_dma.c
index d639e55c5124..1d4e7164e80a 100644
--- a/sound/soc/fsl/mpc5200_dma.c
+++ b/sound/soc/fsl/mpc5200_dma.c
@@ -380,8 +380,8 @@ int mpc5200_audio_dma_create(struct of_device *op)
         int ret;
 
         /* Fetch the registers and IRQ of the PSC */
-        irq = irq_of_parse_and_map(op->node, 0);
-        if (of_address_to_resource(op->node, 0, &res)) {
+        irq = irq_of_parse_and_map(op->dev.of_node, 0);
+        if (of_address_to_resource(op->dev.of_node, 0, &res)) {
                 dev_err(&op->dev, "Missing reg property\n");
                 return -ENODEV;
         }
@@ -399,7 +399,7 @@ int mpc5200_audio_dma_create(struct of_device *op)
         }
 
         /* Get the PSC ID */
-        prop = of_get_property(op->node, "cell-index", &size);
+        prop = of_get_property(op->dev.of_node, "cell-index", &size);
         if (!prop || size < sizeof *prop) {
                 ret = -ENODEV;
                 goto out_free;
diff --git a/sound/soc/fsl/mpc5200_psc_ac97.c b/sound/soc/fsl/mpc5200_psc_ac97.c
index 3dbc7f7cd7b9..e2ee220bfb7e 100644
--- a/sound/soc/fsl/mpc5200_psc_ac97.c
+++ b/sound/soc/fsl/mpc5200_psc_ac97.c
@@ -317,12 +317,12 @@ static struct of_device_id psc_ac97_match[] __devinitdata = {
 MODULE_DEVICE_TABLE(of, psc_ac97_match);
 
 static struct of_platform_driver psc_ac97_driver = {
-        .match_table = psc_ac97_match,
         .probe = psc_ac97_of_probe,
         .remove = __devexit_p(psc_ac97_of_remove),
         .driver = {
                 .name = "mpc5200-psc-ac97",
                 .owner = THIS_MODULE,
+                .of_match_table = psc_ac97_match,
         },
 };
 
diff --git a/sound/soc/fsl/mpc5200_psc_i2s.c b/sound/soc/fsl/mpc5200_psc_i2s.c
index ce8de90fb94a..4f455bd6851f 100644
--- a/sound/soc/fsl/mpc5200_psc_i2s.c
+++ b/sound/soc/fsl/mpc5200_psc_i2s.c
@@ -181,7 +181,7 @@ static int __devinit psc_i2s_of_probe(struct of_device *op,
 
         /* Check for the codec handle.  If it is not present then we
          * are done */
-        if (!of_get_property(op->node, "codec-handle", NULL))
+        if (!of_get_property(op->dev.of_node, "codec-handle", NULL))
                 return 0;
 
         /* Due to errata in the dma mode; need to line up enabling
@@ -220,12 +220,12 @@ static struct of_device_id psc_i2s_match[] __devinitdata = {
 MODULE_DEVICE_TABLE(of, psc_i2s_match);
 
 static struct of_platform_driver psc_i2s_driver = {
-        .match_table = psc_i2s_match,
         .probe = psc_i2s_of_probe,
         .remove = __devexit_p(psc_i2s_of_remove),
         .driver = {
                 .name = "mpc5200-psc-i2s",
                 .owner = THIS_MODULE,
+                .of_match_table = psc_i2s_match,
         },
 };
 
diff --git a/sound/soc/fsl/mpc8610_hpcd.c b/sound/soc/fsl/mpc8610_hpcd.c
index 83de1c81c8c4..6a2764ee8203 100644
--- a/sound/soc/fsl/mpc8610_hpcd.c
+++ b/sound/soc/fsl/mpc8610_hpcd.c
@@ -203,7 +203,7 @@ static struct snd_soc_ops mpc8610_hpcd_ops = {
 static int mpc8610_hpcd_probe(struct of_device *ofdev,
         const struct of_device_id *match)
 {
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
         struct device_node *codec_np = NULL;
         struct device_node *guts_np = NULL;
         struct device_node *dma_np = NULL;
@@ -580,9 +580,11 @@ static struct of_device_id mpc8610_hpcd_match[] = {
 MODULE_DEVICE_TABLE(of, mpc8610_hpcd_match);
 
 static struct of_platform_driver mpc8610_hpcd_of_driver = {
-        .owner          = THIS_MODULE,
-        .name           = "mpc8610_hpcd",
-        .match_table    = mpc8610_hpcd_match,
+        .driver = {
+                .name = "mpc8610_hpcd",
+                .owner = THIS_MODULE,
+                .of_match_table = mpc8610_hpcd_match,
+        },
         .probe          = mpc8610_hpcd_probe,
         .remove         = mpc8610_hpcd_remove,
 };
diff --git a/sound/sparc/amd7930.c b/sound/sparc/amd7930.c
index 574af56ba8a6..71221fd20944 100644
--- a/sound/sparc/amd7930.c
+++ b/sound/sparc/amd7930.c
@@ -1065,8 +1065,11 @@ static const struct of_device_id amd7930_match[] = {
 };
 
 static struct of_platform_driver amd7930_sbus_driver = {
-        .name           = "audio",
-        .match_table    = amd7930_match,
+        .driver = {
+                .name = "audio",
+                .owner = THIS_MODULE,
+                .of_match_table = amd7930_match,
+        },
         .probe          = amd7930_sbus_probe,
 };
 
diff --git a/sound/sparc/cs4231.c b/sound/sparc/cs4231.c
index 7dcc06512e86..fb4c6f2f29e5 100644
--- a/sound/sparc/cs4231.c
+++ b/sound/sparc/cs4231.c
@@ -2075,12 +2075,12 @@ static int __devinit cs4231_ebus_probe(struct of_device *op, const struct of_dev
 static int __devinit cs4231_probe(struct of_device *op, const struct of_device_id *match)
 {
 #ifdef EBUS_SUPPORT
-        if (!strcmp(op->node->parent->name, "ebus"))
+        if (!strcmp(op->dev.of_node->parent->name, "ebus"))
                 return cs4231_ebus_probe(op, match);
 #endif
 #ifdef SBUS_SUPPORT
-        if (!strcmp(op->node->parent->name, "sbus") ||
-            !strcmp(op->node->parent->name, "sbi"))
+        if (!strcmp(op->dev.of_node->parent->name, "sbus") ||
+            !strcmp(op->dev.of_node->parent->name, "sbi"))
                 return cs4231_sbus_probe(op, match);
 #endif
         return -ENODEV;
@@ -2109,8 +2109,11 @@ static const struct of_device_id cs4231_match[] = {
 MODULE_DEVICE_TABLE(of, cs4231_match);
 
 static struct of_platform_driver cs4231_driver = {
-        .name           = "audio",
-        .match_table    = cs4231_match,
+        .driver = {
+                .name = "audio",
+                .owner = THIS_MODULE,
+                .of_match_table = cs4231_match,
+        },
         .probe          = cs4231_probe,
         .remove         = __devexit_p(cs4231_remove),
 };
diff --git a/sound/sparc/dbri.c b/sound/sparc/dbri.c
index 2eab6ce48852..1557bf132e73 100644
--- a/sound/sparc/dbri.c
+++ b/sound/sparc/dbri.c
@@ -2651,7 +2651,7 @@ static int __devinit dbri_probe(struct of_device *op, const struct of_device_id
 
         printk(KERN_INFO "audio%d at %p (irq %d) is DBRI(%c)+CS4215(%d)\n",
                dev, dbri->regs,
-               dbri->irq, op->node->name[9], dbri->mm.version);
+               dbri->irq, op->dev.of_node->name[9], dbri->mm.version);
         dev++;
 
         return 0;
@@ -2687,8 +2687,11 @@ static const struct of_device_id dbri_match[] = {
 MODULE_DEVICE_TABLE(of, dbri_match);
 
 static struct of_platform_driver dbri_sbus_driver = {
-        .name           = "dbri",
-        .match_table    = dbri_match,
+        .driver = {
+                .name = "dbri",
+                .owner = THIS_MODULE,
+                .of_match_table = dbri_match,
+        },
         .probe          = dbri_probe,
         .remove         = __devexit_p(dbri_remove),
 };