146 files changed, 1256 insertions, 697 deletions
diff --git a/drivers/ata/pata_macio.c b/drivers/ata/pata_macio.c
index 25df50f51c0..b5b48e703cb 100644
--- a/drivers/ata/pata_macio.c
+++ b/drivers/ata/pata_macio.c
@@ -1140,7 +1140,7 @@ static int __devinit pata_macio_attach(struct macio_dev *mdev,
                        "Failed to allocate private memory\n");
                return -ENOMEM;
        }
-        priv->node = of_node_get(mdev->ofdev.node);
+        priv->node = of_node_get(mdev->ofdev.dev.of_node);
        priv->mdev = mdev;
        priv->dev = &mdev->ofdev.dev;
diff --git a/drivers/ata/pata_mpc52xx.c b/drivers/ata/pata_mpc52xx.c
index 96b11b604ae..36afe2c1c74 100644
--- a/drivers/ata/pata_mpc52xx.c
+++ b/drivers/ata/pata_mpc52xx.c
@@ -694,7 +694,7 @@ mpc52xx_ata_probe(struct of_device *op, const struct of_device_id *match)
        struct bcom_task *dmatsk = NULL;
        /* Get ipb frequency */
-        ipb_freq = mpc5xxx_get_bus_frequency(op->node);
+        ipb_freq = mpc5xxx_get_bus_frequency(op->dev.of_node);
        if (!ipb_freq) {
                dev_err(&op->dev, "could not determine IPB bus frequency\n");
                return -ENODEV;
@@ -702,7 +702,7 @@ mpc52xx_ata_probe(struct of_device *op, const struct of_device_id *match)
        /* Get device base address from device tree, request the region
         * and ioremap it. */
-        rv = of_address_to_resource(op->node, 0, &res_mem);
+        rv = of_address_to_resource(op->dev.of_node, 0, &res_mem);
        if (rv) {
                dev_err(&op->dev, "could not determine device base address\n");
                return rv;
@@ -735,14 +735,14 @@ mpc52xx_ata_probe(struct of_device *op, const struct of_device_id *match)
         * The MPC5200 ATA controller supports MWDMA modes 0, 1 and 2 and
         * UDMA modes 0, 1 and 2.
         */
-        prop = of_get_property(op->node, "mwdma-mode", &proplen);
+        prop = of_get_property(op->dev.of_node, "mwdma-mode", &proplen);
        if ((prop) && (proplen >= 4))
                mwdma_mask = ATA_MWDMA2 & ((1 << (*prop + 1)) - 1);
-        prop = of_get_property(op->node, "udma-mode", &proplen);
+        prop = of_get_property(op->dev.of_node, "udma-mode", &proplen);
        if ((prop) && (proplen >= 4))
                udma_mask = ATA_UDMA2 & ((1 << (*prop + 1)) - 1);
-        ata_irq = irq_of_parse_and_map(op->node, 0);
+        ata_irq = irq_of_parse_and_map(op->dev.of_node, 0);
        if (ata_irq == NO_IRQ) {
                dev_err(&op->dev, "error mapping irq\n");
                return -EINVAL;
@@ -884,9 +884,6 @@ static struct of_device_id mpc52xx_ata_of_match[] = {
 static struct of_platform_driver mpc52xx_ata_of_platform_driver = {
-        .owner          = THIS_MODULE,
-        .name           = DRV_NAME,
-        .match_table    = mpc52xx_ata_of_match,
        .probe          = mpc52xx_ata_probe,
        .remove         = mpc52xx_ata_remove,
 #ifdef CONFIG_PM
@@ -896,6 +893,7 @@ static struct of_platform_driver mpc52xx_ata_of_platform_driver = {
        .driver         = {
                .name   = DRV_NAME,
                .owner  = THIS_MODULE,
+                .of_match_table = mpc52xx_ata_of_match,
        },
 };
diff --git a/drivers/ata/pata_of_platform.c b/drivers/ata/pata_of_platform.c
index 1f18ad9e4fe..5a1b82c08be 100644
--- a/drivers/ata/pata_of_platform.c
+++ b/drivers/ata/pata_of_platform.c
@@ -18,7 +18,7 @@ static int __devinit pata_of_platform_probe(struct of_device *ofdev,
                                            const struct of_device_id *match)
 {
        int ret;
-        struct device_node *dn = ofdev->node;
+        struct device_node *dn = ofdev->dev.of_node;
        struct resource io_res;
        struct resource ctl_res;
        struct resource irq_res;
@@ -91,8 +91,11 @@ static struct of_device_id pata_of_platform_match[] = {
 MODULE_DEVICE_TABLE(of, pata_of_platform_match);
 static struct of_platform_driver pata_of_platform_driver = {
-        .name           = "pata_of_platform",
+        .driver = {
-        .match_table    = pata_of_platform_match,
+                .name = "pata_of_platform",
+                .owner = THIS_MODULE,
+                .of_match_table = pata_of_platform_match,
+        },
        .probe          = pata_of_platform_probe,
        .remove         = __devexit_p(pata_of_platform_remove),
 };
diff --git a/drivers/ata/sata_fsl.c b/drivers/ata/sata_fsl.c
index a69192b38b4..61c89b54ea2 100644
--- a/drivers/ata/sata_fsl.c
+++ b/drivers/ata/sata_fsl.c
@@ -1313,7 +1313,7 @@ static int sata_fsl_probe(struct of_device *ofdev,
        dev_printk(KERN_INFO, &ofdev->dev,
                   "Sata FSL Platform/CSB Driver init\n");
-        hcr_base = of_iomap(ofdev->node, 0);
+        hcr_base = of_iomap(ofdev->dev.of_node, 0);
        if (!hcr_base)
                goto error_exit_with_cleanup;
@@ -1332,7 +1332,7 @@ static int sata_fsl_probe(struct of_device *ofdev,
        host_priv->ssr_base = ssr_base;
        host_priv->csr_base = csr_base;
-        irq = irq_of_parse_and_map(ofdev->node, 0);
+        irq = irq_of_parse_and_map(ofdev->dev.of_node, 0);
        if (irq < 0) {
                dev_printk(KERN_ERR, &ofdev->dev, "invalid irq from platform\n");
                goto error_exit_with_cleanup;
@@ -1427,8 +1427,11 @@ static struct of_device_id fsl_sata_match[] = {
 MODULE_DEVICE_TABLE(of, fsl_sata_match);
 static struct of_platform_driver fsl_sata_driver = {
-        .name           = "fsl-sata",
+        .driver = {
-        .match_table    = fsl_sata_match,
+                .name = "fsl-sata",
+                .owner = THIS_MODULE,
+                .of_match_table = fsl_sata_match,
+        },
        .probe          = sata_fsl_probe,
        .remove         = sata_fsl_remove,
 #ifdef CONFIG_PM
diff --git a/drivers/atm/fore200e.c b/drivers/atm/fore200e.c
index f7d6ebaa041..da8f176c051 100644
--- a/drivers/atm/fore200e.c
+++ b/drivers/atm/fore200e.c
@@ -789,7 +789,7 @@ static int __init fore200e_sba_map(struct fore200e *fore200e)
        fore200e->bus->write(0x02, fore200e->regs.sba.isr); /* XXX hardwired interrupt level */
        /* get the supported DVMA burst sizes */
-        bursts = of_getintprop_default(op->node->parent, "burst-sizes", 0x00);
+        bursts = of_getintprop_default(op->dev.of_node->parent, "burst-sizes", 0x00);
        if (sbus_can_dma_64bit())
                sbus_set_sbus64(&op->dev, bursts);
@@ -820,18 +820,20 @@ static int __init fore200e_sba_prom_read(struct fore200e *fore200e, struct prom_
        const u8 *prop;
        int len;
-        prop = of_get_property(op->node, "madaddrlo2", &len);
+        prop = of_get_property(op->dev.of_node, "madaddrlo2", &len);
        if (!prop)
                return -ENODEV;
        memcpy(&prom->mac_addr[4], prop, 4);
-        prop = of_get_property(op->node, "madaddrhi4", &len);
+        prop = of_get_property(op->dev.of_node, "madaddrhi4", &len);
        if (!prop)
                return -ENODEV;
        memcpy(&prom->mac_addr[2], prop, 4);
-        prom->serial_number = of_getintprop_default(op->node, "serialnumber", 0);
+        prom->serial_number = of_getintprop_default(op->dev.of_node,
-        prom->hw_revision = of_getintprop_default(op->node, "promversion", 0);
+                                                    "serialnumber", 0);
+        prom->hw_revision = of_getintprop_default(op->dev.of_node,
+                                                  "promversion", 0);
    
        return 0;
 }
@@ -841,10 +843,10 @@ static int fore200e_sba_proc_read(struct fore200e *fore200e, char *page)
        struct of_device *op = fore200e->bus_dev;
        const struct linux_prom_registers *regs;
-        regs = of_get_property(op->node, "reg", NULL);
+        regs = of_get_property(op->dev.of_node, "reg", NULL);
        return sprintf(page, "   SBUS slot/device:\t\t%d/'%s'\n",
-                       (regs ? regs->which_io : 0), op->node->name);
+                       (regs ? regs->which_io : 0), op->dev.of_node->name);
 }
 #endif /* CONFIG_SBUS */
@@ -2693,8 +2695,11 @@ static const struct of_device_id fore200e_sba_match[] = {
 MODULE_DEVICE_TABLE(of, fore200e_sba_match);
 static struct of_platform_driver fore200e_sba_driver = {
-        .name           = "fore_200e",
+        .driver = {
-        .match_table    = fore200e_sba_match,
+                .name = "fore_200e",
+                .owner = THIS_MODULE,
+                .of_match_table = fore200e_sba_match,
+        },
        .probe          = fore200e_sba_probe,
        .remove         = __devexit_p(fore200e_sba_remove),
 };
diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c
index 59ca2b77b57..52f2d11bc7b 100644
--- a/drivers/block/swim3.c
+++ b/drivers/block/swim3.c
@@ -1004,7 +1004,7 @@ static const struct block_device_operations floppy_fops = {
 static int swim3_add_device(struct macio_dev *mdev, int index)
 {
-        struct device_node *swim = mdev->ofdev.node;
+        struct device_node *swim = mdev->ofdev.dev.of_node;
        struct floppy_state *fs = &floppy_states[index];
        int rc = -EBUSY;
diff --git a/drivers/block/xsysace.c b/drivers/block/xsysace.c
index e1c95e208a6..a7b83c0a7eb 100644
--- a/drivers/block/xsysace.c
+++ b/drivers/block/xsysace.c
@@ -1198,10 +1198,10 @@ ace_of_probe(struct of_device *op, const struct of_device_id *match)
        dev_dbg(&op->dev, "ace_of_probe(%p, %p)\n", op, match);
        /* device id */
-        id = of_get_property(op->node, "port-number", NULL);
+        id = of_get_property(op->dev.of_node, "port-number", NULL);
        /* physaddr */
-        rc = of_address_to_resource(op->node, 0, &res);
+        rc = of_address_to_resource(op->dev.of_node, 0, &res);
        if (rc) {
                dev_err(&op->dev, "invalid address\n");
                return rc;
@@ -1209,11 +1209,11 @@ ace_of_probe(struct of_device *op, const struct of_device_id *match)
        physaddr = res.start;
        /* irq */
-        irq = irq_of_parse_and_map(op->node, 0);
+        irq = irq_of_parse_and_map(op->dev.of_node, 0);
        /* bus width */
        bus_width = ACE_BUS_WIDTH_16;
-        if (of_find_property(op->node, "8-bit", NULL))
+        if (of_find_property(op->dev.of_node, "8-bit", NULL))
                bus_width = ACE_BUS_WIDTH_8;
        /* Call the bus-independant setup code */
@@ -1237,13 +1237,12 @@ static const struct of_device_id ace_of_match[] __devinitconst = {
 MODULE_DEVICE_TABLE(of, ace_of_match);
 static struct of_platform_driver ace_of_driver = {
-        .owner = THIS_MODULE,
-        .name = "xsysace",
-        .match_table = ace_of_match,
        .probe = ace_of_probe,
        .remove = __devexit_p(ace_of_remove),
        .driver = {
                .name = "xsysace",
+                .owner = THIS_MODULE,
+                .of_match_table = ace_of_match,
        },
 };
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c
index cc435be0bc1..451cd7071b1 100644
--- a/drivers/cdrom/viocd.c
+++ b/drivers/cdrom/viocd.c
@@ -567,7 +567,7 @@ static int viocd_probe(struct vio_dev *vdev, const struct vio_device_id *id)
        struct disk_info *d;
        struct cdrom_device_info *c;
        struct request_queue *q;
-        struct device_node *node = vdev->dev.archdata.of_node;
+        struct device_node *node = vdev->dev.of_node;
        deviceno = vdev->unit_address;
        if (deviceno >= VIOCD_MAX_CD)
diff --git a/drivers/char/hw_random/n2-drv.c b/drivers/char/hw_random/n2-drv.c
index 10f868eefaa..0f9cbf1aaf1 100644
--- a/drivers/char/hw_random/n2-drv.c
+++ b/drivers/char/hw_random/n2-drv.c
@@ -660,7 +660,7 @@ static int __devinit n2rng_probe(struct of_device *op,
                                np->hvapi_major);
                        goto out_hvapi_unregister;
                }
-                np->num_units = of_getintprop_default(op->node,
+                np->num_units = of_getintprop_default(op->dev.of_node,
                                                      "rng-#units", 0);
                if (!np->num_units) {
                        dev_err(&op->dev, "VF RNG lacks rng-#units property\n");
@@ -751,8 +751,11 @@ static const struct of_device_id n2rng_match[] = {
 MODULE_DEVICE_TABLE(of, n2rng_match);
 static struct of_platform_driver n2rng_driver = {
-        .name           = "n2rng",
+        .driver = {
-        .match_table    = n2rng_match,
+                .name = "n2rng",
+                .owner = THIS_MODULE,
+                .of_match_table = n2rng_match,
+        },
        .probe          = n2rng_probe,
        .remove         = __devexit_p(n2rng_remove),
 };
diff --git a/drivers/char/hw_random/pasemi-rng.c b/drivers/char/hw_random/pasemi-rng.c
index 7fa61dd1d9d..261ba8f22b8 100644
--- a/drivers/char/hw_random/pasemi-rng.c
+++ b/drivers/char/hw_random/pasemi-rng.c
@@ -98,7 +98,7 @@ static int __devinit rng_probe(struct of_device *ofdev,
                               const struct of_device_id *match)
 {
        void __iomem *rng_regs;
-        struct device_node *rng_np = ofdev->node;
+        struct device_node *rng_np = ofdev->dev.of_node;
        struct resource res;
        int err = 0;
@@ -140,8 +140,11 @@ static struct of_device_id rng_match[] = {
 };
 static struct of_platform_driver rng_driver = {
-        .name           = "pasemi-rng",
+        .driver = {
-        .match_table    = rng_match,
+                .name = "pasemi-rng",
+                .owner = THIS_MODULE,
+                .of_match_table = rng_match,
+        },
        .probe          = rng_probe,
        .remove         = rng_remove,
 };
diff --git a/drivers/char/ipmi/ipmi_si_intf.c b/drivers/char/ipmi/ipmi_si_intf.c
index 4462b113ba3..47ffe4a90a9 100644
--- a/drivers/char/ipmi/ipmi_si_intf.c
+++ b/drivers/char/ipmi/ipmi_si_intf.c
@@ -2469,7 +2469,7 @@ static int __devinit ipmi_of_probe(struct of_device *dev,
        struct smi_info *info;
        struct resource resource;
        const int *regsize, *regspacing, *regshift;
-        struct device_node *np = dev->node;
+        struct device_node *np = dev->dev.of_node;
        int ret;
        int proplen;
@@ -2525,7 +2525,7 @@ static int __devinit ipmi_of_probe(struct of_device *dev,
        info->io.regspacing     = regspacing ? *regspacing : DEFAULT_REGSPACING;
        info->io.regshift       = regshift ? *regshift : 0;
-        info->irq               = irq_of_parse_and_map(dev->node, 0);
+        info->irq               = irq_of_parse_and_map(dev->dev.of_node, 0);
        info->dev               = &dev->dev;
        dev_dbg(&dev->dev, "addr 0x%lx regsize %d spacing %d irq %x\n",
@@ -2555,8 +2555,11 @@ static struct of_device_id ipmi_match[] =
 };
 static struct of_platform_driver ipmi_of_platform_driver = {
-        .name           = "ipmi",
+        .driver = {
-        .match_table    = ipmi_match,
+                .name = "ipmi",
+                .owner = THIS_MODULE,
+                .of_match_table = ipmi_match,
+        },
        .probe          = ipmi_of_probe,
        .remove         = __devexit_p(ipmi_of_remove),
 };
diff --git a/drivers/char/viotape.c b/drivers/char/viotape.c
index 1144a04cda6..42f7fa442ff 100644
--- a/drivers/char/viotape.c
+++ b/drivers/char/viotape.c
@@ -866,7 +866,7 @@ static int viotape_probe(struct vio_dev *vdev, const struct vio_device_id *id)
 {
        int i = vdev->unit_address;
        int j;
-        struct device_node *node = vdev->dev.archdata.of_node;
+        struct device_node *node = vdev->dev.of_node;
        if (i >= VIOTAPE_MAX_TAPE)
                return -ENODEV;
diff --git a/drivers/char/xilinx_hwicap/xilinx_hwicap.c b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
index 7261b8d9087..ed8a9cec2a0 100644
--- a/drivers/char/xilinx_hwicap/xilinx_hwicap.c
+++ b/drivers/char/xilinx_hwicap/xilinx_hwicap.c
@@ -772,18 +772,18 @@ hwicap_of_probe(struct of_device *op, const struct of_device_id *match)
        dev_dbg(&op->dev, "hwicap_of_probe(%p, %p)\n", op, match);
-        rc = of_address_to_resource(op->node, 0, &res);
+        rc = of_address_to_resource(op->dev.of_node, 0, &res);
        if (rc) {
                dev_err(&op->dev, "invalid address\n");
                return rc;
        }
-        id = of_get_property(op->node, "port-number", NULL);
+        id = of_get_property(op->dev.of_node, "port-number", NULL);
        /* It's most likely that we're using V4, if the family is not
           specified */
        regs = &v4_config_registers;
-        family = of_get_property(op->node, "xlnx,family", NULL);
+        family = of_get_property(op->dev.of_node, "xlnx,family", NULL);
        if (family) {
                if (!strcmp(family, "virtex2p")) {
@@ -812,13 +812,12 @@ static const struct of_device_id __devinitconst hwicap_of_match[] = {
 MODULE_DEVICE_TABLE(of, hwicap_of_match);
 static struct of_platform_driver hwicap_of_driver = {
-        .owner = THIS_MODULE,
-        .name = DRIVER_NAME,
-        .match_table = hwicap_of_match,
        .probe = hwicap_of_probe,
        .remove = __devexit_p(hwicap_of_remove),
        .driver = {
                .name = DRIVER_NAME,
+                .owner = THIS_MODULE,
+                .of_match_table = hwicap_of_match,
        },
 };
diff --git a/drivers/crypto/amcc/crypto4xx_core.c b/drivers/crypto/amcc/crypto4xx_core.c
index 6c4c8b7ce3a..9d65b371de6 100644
--- a/drivers/crypto/amcc/crypto4xx_core.c
+++ b/drivers/crypto/amcc/crypto4xx_core.c
@@ -1281,8 +1281,11 @@ static const struct of_device_id crypto4xx_match[] = {
 };
 static struct of_platform_driver crypto4xx_driver = {
-        .name           = "crypto4xx",
+        .driver = {
-        .match_table    = crypto4xx_match,
+                .name = "crypto4xx",
+                .owner = THIS_MODULE,
+                .of_match_table = crypto4xx_match,
+        },
        .probe          = crypto4xx_probe,
        .remove         = crypto4xx_remove,
 };
diff --git a/drivers/crypto/talitos.c b/drivers/crypto/talitos.c
index 6a0f59d1fc5..637c105f53d 100644
--- a/drivers/crypto/talitos.c
+++ b/drivers/crypto/talitos.c
@@ -2398,7 +2398,7 @@ static int talitos_probe(struct of_device *ofdev,
                         const struct of_device_id *match)
 {
        struct device *dev = &ofdev->dev;
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
        struct talitos_private *priv;
        const unsigned int *prop;
        int i, err;
@@ -2573,8 +2573,11 @@ static const struct of_device_id talitos_match[] = {
 MODULE_DEVICE_TABLE(of, talitos_match);
 static struct of_platform_driver talitos_driver = {
-        .name = "talitos",
+        .driver = {
-        .match_table = talitos_match,
+                .name = "talitos",
+                .owner = THIS_MODULE,
+                .of_match_table = talitos_match,
+        },
        .probe = talitos_probe,
        .remove = talitos_remove,
 };
diff --git a/drivers/dma/fsldma.c b/drivers/dma/fsldma.c
index 1fdf180cbd6..8088b14ba5f 100644
--- a/drivers/dma/fsldma.c
+++ b/drivers/dma/fsldma.c
@@ -1315,7 +1315,7 @@ static int __devinit fsldma_of_probe(struct of_device *op,
        INIT_LIST_HEAD(&fdev->common.channels);
        /* ioremap the registers for use */
-        fdev->regs = of_iomap(op->node, 0);
+        fdev->regs = of_iomap(op->dev.of_node, 0);
        if (!fdev->regs) {
                dev_err(&op->dev, "unable to ioremap registers\n");
                err = -ENOMEM;
@@ -1323,7 +1323,7 @@ static int __devinit fsldma_of_probe(struct of_device *op,
        }
        /* map the channel IRQ if it exists, but don't hookup the handler yet */
-        fdev->irq = irq_of_parse_and_map(op->node, 0);
+        fdev->irq = irq_of_parse_and_map(op->dev.of_node, 0);
        dma_cap_set(DMA_MEMCPY, fdev->common.cap_mask);
        dma_cap_set(DMA_INTERRUPT, fdev->common.cap_mask);
@@ -1345,7 +1345,7 @@ static int __devinit fsldma_of_probe(struct of_device *op,
         * of_platform_bus_remove(). Instead, we manually instantiate every DMA
         * channel object.
         */
-        for_each_child_of_node(op->node, child) {
+        for_each_child_of_node(op->dev.of_node, child) {
                if (of_device_is_compatible(child, "fsl,eloplus-dma-channel")) {
                        fsl_dma_chan_probe(fdev, child,
                                FSL_DMA_IP_85XX | FSL_DMA_BIG_ENDIAN,
@@ -1411,10 +1411,13 @@ static const struct of_device_id fsldma_of_ids[] = {
 };
 static struct of_platform_driver fsldma_of_driver = {
-        .name           = "fsl-elo-dma",
+        .driver = {
-        .match_table    = fsldma_of_ids,
+                .name = "fsl-elo-dma",
-        .probe          = fsldma_of_probe,
+                .owner = THIS_MODULE,
-        .remove         = fsldma_of_remove,
+                .of_match_table = fsldma_of_ids,
+        },
+        .probe = fsldma_of_probe,
+        .remove = fsldma_of_remove,
 };
 /*----------------------------------------------------------------------------*/
diff --git a/drivers/dma/ppc4xx/adma.c b/drivers/dma/ppc4xx/adma.c
index c6079fcca13..fa98abe4686 100644
--- a/drivers/dma/ppc4xx/adma.c
+++ b/drivers/dma/ppc4xx/adma.c
@@ -4944,12 +4944,12 @@ static const struct of_device_id ppc440spe_adma_of_match[] __devinitconst = {
 MODULE_DEVICE_TABLE(of, ppc440spe_adma_of_match);
 static struct of_platform_driver ppc440spe_adma_driver = {
-        .match_table = ppc440spe_adma_of_match,
        .probe = ppc440spe_adma_probe,
        .remove = __devexit_p(ppc440spe_adma_remove),
        .driver = {
                .name = "PPC440SP(E)-ADMA",
                .owner = THIS_MODULE,
+                .of_match_table = ppc440spe_adma_of_match,
        },
 };
diff --git a/drivers/dma/shdma.c b/drivers/dma/shdma.c
index a1727522343..a2a519fd2a2 100644
--- a/drivers/dma/shdma.c
+++ b/drivers/dma/shdma.c
@@ -722,6 +722,10 @@ static void sh_dmae_chan_ld_cleanup(struct sh_dmae_chan *sh_chan, bool all)
 {
        while (__ld_cleanup(sh_chan, all))
                ;
+        if (all)
+                /* Terminating - forgive uncompleted cookies */
+                sh_chan->completed_cookie = sh_chan->common.cookie;
 }
 static void sh_chan_xfer_ld_queue(struct sh_dmae_chan *sh_chan)
@@ -1188,6 +1192,7 @@ static struct platform_driver sh_dmae_driver = {
        .remove         = __exit_p(sh_dmae_remove),
        .shutdown       = sh_dmae_shutdown,
        .driver = {
+                .owner  = THIS_MODULE,
                .name   = "sh-dma-engine",
        },
 };
diff --git a/drivers/edac/mpc85xx_edac.c b/drivers/edac/mpc85xx_edac.c
index 4471647b480..6c1886b497f 100644
--- a/drivers/edac/mpc85xx_edac.c
+++ b/drivers/edac/mpc85xx_edac.c
@@ -338,15 +338,13 @@ static struct of_device_id mpc85xx_pci_err_of_match[] = {
 };
 static struct of_platform_driver mpc85xx_pci_err_driver = {
-        .owner = THIS_MODULE,
-        .name = "mpc85xx_pci_err",
-        .match_table = mpc85xx_pci_err_of_match,
        .probe = mpc85xx_pci_err_probe,
        .remove = __devexit_p(mpc85xx_pci_err_remove),
        .driver = {
-                   .name = "mpc85xx_pci_err",
+                .name = "mpc85xx_pci_err",
-                   .owner = THIS_MODULE,
+                .owner = THIS_MODULE,
-                   },
+                .of_match_table = mpc85xx_pci_err_of_match,
+        },
 };
 #endif                          /* CONFIG_PCI */
@@ -654,15 +652,13 @@ static struct of_device_id mpc85xx_l2_err_of_match[] = {
 };
 static struct of_platform_driver mpc85xx_l2_err_driver = {
-        .owner = THIS_MODULE,
-        .name = "mpc85xx_l2_err",
-        .match_table = mpc85xx_l2_err_of_match,
        .probe = mpc85xx_l2_err_probe,
        .remove = mpc85xx_l2_err_remove,
        .driver = {
-                   .name = "mpc85xx_l2_err",
+                .name = "mpc85xx_l2_err",
-                   .owner = THIS_MODULE,
+                .owner = THIS_MODULE,
-                   },
+                .of_match_table = mpc85xx_l2_err_of_match,
+        },
 };
 /**************************** MC Err device ***************************/
@@ -1131,15 +1127,13 @@ static struct of_device_id mpc85xx_mc_err_of_match[] = {
 };
 static struct of_platform_driver mpc85xx_mc_err_driver = {
-        .owner = THIS_MODULE,
-        .name = "mpc85xx_mc_err",
-        .match_table = mpc85xx_mc_err_of_match,
        .probe = mpc85xx_mc_err_probe,
        .remove = mpc85xx_mc_err_remove,
        .driver = {
-                   .name = "mpc85xx_mc_err",
+                .name = "mpc85xx_mc_err",
-                   .owner = THIS_MODULE,
+                .owner = THIS_MODULE,
-                   },
+                .of_match_table = mpc85xx_mc_err_of_match,
+        },
 };
 #ifdef CONFIG_MPC85xx
diff --git a/drivers/edac/ppc4xx_edac.c b/drivers/edac/ppc4xx_edac.c
index 11f2172aa1e..9d6f6783328 100644
--- a/drivers/edac/ppc4xx_edac.c
+++ b/drivers/edac/ppc4xx_edac.c
@@ -202,13 +202,13 @@ static struct of_device_id ppc4xx_edac_match[] = {
 };
 static struct of_platform_driver ppc4xx_edac_driver = {
-        .match_table            = ppc4xx_edac_match,
        .probe                  = ppc4xx_edac_probe,
        .remove                 = ppc4xx_edac_remove,
-        .driver                 = {
+        .driver = {
-                .owner  = THIS_MODULE,
+                .owner = THIS_MODULE,
-                .name   = PPC4XX_EDAC_MODULE_NAME
+                .name = PPC4XX_EDAC_MODULE_NAME
-        }
+                .of_match_table = ppc4xx_edac_match,
+        },
 };
 /*
diff --git a/drivers/gpio/pca953x.c b/drivers/gpio/pca953x.c
index b827c976dc6..f156ab3bb6e 100644
--- a/drivers/gpio/pca953x.c
+++ b/drivers/gpio/pca953x.c
@@ -449,7 +449,7 @@ pca953x_get_alt_pdata(struct i2c_client *client)
        struct device_node *node;
        const uint16_t *val;
-        node = dev_archdata_get_node(&client->dev.archdata);
+        node = client->dev.of_node;
        if (node == NULL)
                return NULL;
diff --git a/drivers/hwmon/ultra45_env.c b/drivers/hwmon/ultra45_env.c
index 68e90abeba9..5da5942cf97 100644
--- a/drivers/hwmon/ultra45_env.c
+++ b/drivers/hwmon/ultra45_env.c
@@ -300,8 +300,11 @@ static const struct of_device_id env_match[] = {
 MODULE_DEVICE_TABLE(of, env_match);
 static struct of_platform_driver env_driver = {
-        .name           = "ultra45_env",
+        .driver = {
-        .match_table    = env_match,
+                .name = "ultra45_env",
+                .owner = THIS_MODULE,
+                .of_match_table = env_match,
+        },
        .probe          = env_probe,
        .remove         = __devexit_p(env_remove),
 };
diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c
index 16948db3897..b02b4533651 100644
--- a/drivers/i2c/busses/i2c-cpm.c
+++ b/drivers/i2c/busses/i2c-cpm.c
@@ -440,7 +440,7 @@ static int __devinit cpm_i2c_setup(struct cpm_i2c *cpm)
        init_waitqueue_head(&cpm->i2c_wait);
-        cpm->irq = of_irq_to_resource(ofdev->node, 0, NULL);
+        cpm->irq = of_irq_to_resource(ofdev->dev.of_node, 0, NULL);
        if (!cpm->irq)
                return -EINVAL;
@@ -451,13 +451,13 @@ static int __devinit cpm_i2c_setup(struct cpm_i2c *cpm)
                return ret;
        /* I2C parameter RAM */
-        i2c_base = of_iomap(ofdev->node, 1);
+        i2c_base = of_iomap(ofdev->dev.of_node, 1);
        if (i2c_base == NULL) {
                ret = -EINVAL;
                goto out_irq;
        }
-        if (of_device_is_compatible(ofdev->node, "fsl,cpm1-i2c")) {
+        if (of_device_is_compatible(ofdev->dev.of_node, "fsl,cpm1-i2c")) {
                /* Check for and use a microcode relocation patch. */
                cpm->i2c_ram = i2c_base;
@@ -474,7 +474,7 @@ static int __devinit cpm_i2c_setup(struct cpm_i2c *cpm)
                cpm->version = 1;
-        } else if (of_device_is_compatible(ofdev->node, "fsl,cpm2-i2c")) {
+        } else if (of_device_is_compatible(ofdev->dev.of_node, "fsl,cpm2-i2c")) {
                cpm->i2c_addr = cpm_muram_alloc(sizeof(struct i2c_ram), 64);
                cpm->i2c_ram = cpm_muram_addr(cpm->i2c_addr);
                out_be16(i2c_base, cpm->i2c_addr);
@@ -489,24 +489,24 @@ static int __devinit cpm_i2c_setup(struct cpm_i2c *cpm)
        }
        /* I2C control/status registers */
-        cpm->i2c_reg = of_iomap(ofdev->node, 0);
+        cpm->i2c_reg = of_iomap(ofdev->dev.of_node, 0);
        if (cpm->i2c_reg == NULL) {
                ret = -EINVAL;
                goto out_ram;
        }
-        data = of_get_property(ofdev->node, "fsl,cpm-command", &len);
+        data = of_get_property(ofdev->dev.of_node, "fsl,cpm-command", &len);
        if (!data || len != 4) {
                ret = -EINVAL;
                goto out_reg;
        }
        cpm->cp_command = *data;
-        data = of_get_property(ofdev->node, "linux,i2c-class", &len);
+        data = of_get_property(ofdev->dev.of_node, "linux,i2c-class", &len);
        if (data && len == 4)
                cpm->adap.class = *data;
-        data = of_get_property(ofdev->node, "clock-frequency", &len);
+        data = of_get_property(ofdev->dev.of_node, "clock-frequency", &len);
        if (data && len == 4)
                cpm->freq = *data;
        else
@@ -661,7 +661,7 @@ static int __devinit cpm_i2c_probe(struct of_device *ofdev,
        /* register new adapter to i2c module... */
-        data = of_get_property(ofdev->node, "linux,i2c-index", &len);
+        data = of_get_property(ofdev->dev.of_node, "linux,i2c-index", &len);
        if (data && len == 4) {
                cpm->adap.nr = *data;
                result = i2c_add_numbered_adapter(&cpm->adap);
@@ -679,7 +679,7 @@ static int __devinit cpm_i2c_probe(struct of_device *ofdev,
        /*
         * register OF I2C devices
         */
-        of_register_i2c_devices(&cpm->adap, ofdev->node);
+        of_register_i2c_devices(&cpm->adap, ofdev->dev.of_node);
        return 0;
 out_shut:
@@ -718,13 +718,13 @@ static const struct of_device_id cpm_i2c_match[] = {
 MODULE_DEVICE_TABLE(of, cpm_i2c_match);
 static struct of_platform_driver cpm_i2c_driver = {
-        .match_table    = cpm_i2c_match,
        .probe          = cpm_i2c_probe,
        .remove         = __devexit_p(cpm_i2c_remove),
-        .driver         = {
+        .driver = {
-                .name   = "fsl-i2c-cpm",
+                .name = "fsl-i2c-cpm",
-                .owner  = THIS_MODULE,
+                .owner = THIS_MODULE,
-        }
+                .of_match_table = cpm_i2c_match,
+        },
 };
 static int __init cpm_i2c_init(void)
diff --git a/drivers/i2c/busses/i2c-ibm_iic.c b/drivers/i2c/busses/i2c-ibm_iic.c
index f8ccc0fe95a..bf344135647 100644
--- a/drivers/i2c/busses/i2c-ibm_iic.c
+++ b/drivers/i2c/busses/i2c-ibm_iic.c
@@ -664,7 +664,7 @@ static inline u8 iic_clckdiv(unsigned int opb)
 static int __devinit iic_request_irq(struct of_device *ofdev,
                                     struct ibm_iic_private *dev)
 {
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
        int irq;
        if (iic_force_poll)
@@ -695,7 +695,7 @@ static int __devinit iic_request_irq(struct of_device *ofdev,
 static int __devinit iic_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 ibm_iic_private *dev;
        struct i2c_adapter *adap;
        const u32 *freq;
@@ -807,8 +807,11 @@ static const struct of_device_id ibm_iic_match[] = {
 };
 static struct of_platform_driver ibm_iic_driver = {
-        .name   = "ibm-iic",
+        .driver = {
-        .match_table = ibm_iic_match,
+                .name = "ibm-iic",
+                .owner = THIS_MODULE,
+                .of_match_table = ibm_iic_match,
+        },
        .probe  = iic_probe,
        .remove = __devexit_p(iic_remove),
 };
diff --git a/drivers/i2c/busses/i2c-mpc.c b/drivers/i2c/busses/i2c-mpc.c
index e86cef300c7..df00eb1f11f 100644
--- a/drivers/i2c/busses/i2c-mpc.c
+++ b/drivers/i2c/busses/i2c-mpc.c
@@ -560,14 +560,14 @@ static int __devinit fsl_i2c_probe(struct of_device *op,
        init_waitqueue_head(&i2c->queue);
-        i2c->base = of_iomap(op->node, 0);
+        i2c->base = of_iomap(op->dev.of_node, 0);
        if (!i2c->base) {
                dev_err(i2c->dev, "failed to map controller\n");
                result = -ENOMEM;
                goto fail_map;
        }
-        i2c->irq = irq_of_parse_and_map(op->node, 0);
+        i2c->irq = irq_of_parse_and_map(op->dev.of_node, 0);
        if (i2c->irq) { /* no i2c->irq implies polling */
                result = request_irq(i2c->irq, mpc_i2c_isr,
                                     IRQF_SHARED, "i2c-mpc", i2c);
@@ -577,21 +577,22 @@ static int __devinit fsl_i2c_probe(struct of_device *op,
                }
        }
-        if (of_get_property(op->node, "fsl,preserve-clocking", NULL)) {
+        if (of_get_property(op->dev.of_node, "fsl,preserve-clocking", NULL)) {
                clock = MPC_I2C_CLOCK_PRESERVE;
        } else {
-                prop = of_get_property(op->node, "clock-frequency", &plen);
+                prop = of_get_property(op->dev.of_node, "clock-frequency",
+                                        &plen);
                if (prop && plen == sizeof(u32))
                        clock = *prop;
        }
        if (match->data) {
                struct mpc_i2c_data *data = match->data;
-                data->setup(op->node, i2c, clock, data->prescaler);
+                data->setup(op->dev.of_node, i2c, clock, data->prescaler);
        } else {
                /* Backwards compatibility */
-                if (of_get_property(op->node, "dfsrr", NULL))
+                if (of_get_property(op->dev.of_node, "dfsrr", NULL))
-                        mpc_i2c_setup_8xxx(op->node, i2c, clock, 0);
+                        mpc_i2c_setup_8xxx(op->dev.of_node, i2c, clock, 0);
        }
        dev_set_drvdata(&op->dev, i2c);
@@ -605,7 +606,7 @@ static int __devinit fsl_i2c_probe(struct of_device *op,
                dev_err(i2c->dev, "failed to add adapter\n");
                goto fail_add;
        }
-        of_register_i2c_devices(&i2c->adap, op->node);
+        of_register_i2c_devices(&i2c->adap, op->dev.of_node);
        return result;
@@ -674,12 +675,12 @@ MODULE_DEVICE_TABLE(of, mpc_i2c_of_match);
 /* Structure for a device driver */
 static struct of_platform_driver mpc_i2c_driver = {
-        .match_table    = mpc_i2c_of_match,
        .probe          = fsl_i2c_probe,
        .remove         = __devexit_p(fsl_i2c_remove),
-        .driver         = {
+        .driver = {
-                .owner  = THIS_MODULE,
+                .owner = THIS_MODULE,
-                .name   = DRV_NAME,
+                .name = DRV_NAME,
+                .of_match_table = mpc_i2c_of_match,
        },
 };
diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
index db3c9f3a764..e0f833cca3f 100644
--- a/drivers/i2c/i2c-core.c
+++ b/drivers/i2c/i2c-core.c
@@ -418,6 +418,9 @@ i2c_new_device(struct i2c_adapter *adap, struct i2c_board_info const *info)
        client->dev.parent = &client->adapter->dev;
        client->dev.bus = &i2c_bus_type;
        client->dev.type = &i2c_client_type;
+#ifdef CONFIG_OF
+        client->dev.of_node = info->of_node;
+#endif
        dev_set_name(&client->dev, "%d-%04x", i2c_adapter_id(adap),
                     client->addr);
diff --git a/drivers/ide/pmac.c b/drivers/ide/pmac.c
index 159955d16c4..183fa38760d 100644
--- a/drivers/ide/pmac.c
+++ b/drivers/ide/pmac.c
@@ -1153,7 +1153,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match)
        if (macio_resource_count(mdev) == 0) {
                printk(KERN_WARNING "ide-pmac: no address for %s\n",
-                                    mdev->ofdev.node->full_name);
+                                    mdev->ofdev.dev.of_node->full_name);
                rc = -ENXIO;
                goto out_free_pmif;
        }
@@ -1161,7 +1161,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match)
        /* Request memory resource for IO ports */
        if (macio_request_resource(mdev, 0, "ide-pmac (ports)")) {
                printk(KERN_ERR "ide-pmac: can't request MMIO resource for "
-                                "%s!\n", mdev->ofdev.node->full_name);
+                                "%s!\n", mdev->ofdev.dev.of_node->full_name);
                rc = -EBUSY;
                goto out_free_pmif;
        }
@@ -1173,7 +1173,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match)
         */
        if (macio_irq_count(mdev) == 0) {
                printk(KERN_WARNING "ide-pmac: no intrs for device %s, using "
-                                    "13\n", mdev->ofdev.node->full_name);
+                                    "13\n", mdev->ofdev.dev.of_node->full_name);
                irq = irq_create_mapping(NULL, 13);
        } else
                irq = macio_irq(mdev, 0);
@@ -1182,7 +1182,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match)
        regbase = (unsigned long) base;
        pmif->mdev = mdev;
-        pmif->node = mdev->ofdev.node;
+        pmif->node = mdev->ofdev.dev.of_node;
        pmif->regbase = regbase;
        pmif->irq = irq;
        pmif->kauai_fcr = NULL;
@@ -1191,7 +1191,7 @@ pmac_ide_macio_attach(struct macio_dev *mdev, const struct of_device_id *match)
                if (macio_request_resource(mdev, 1, "ide-pmac (dma)"))
                        printk(KERN_WARNING "ide-pmac: can't request DMA "
                                            "resource for %s!\n",
-                                            mdev->ofdev.node->full_name);
+                                            mdev->ofdev.dev.of_node->full_name);
                else
                        pmif->dma_regs = ioremap(macio_resource_start(mdev, 1), 0x1000);
        } else
diff --git a/drivers/infiniband/hw/ehca/ehca_main.c b/drivers/infiniband/hw/ehca/ehca_main.c
index 129a6bebd6e..252489e8836 100644
--- a/drivers/infiniband/hw/ehca/ehca_main.c
+++ b/drivers/infiniband/hw/ehca/ehca_main.c
@@ -291,8 +291,9 @@ static int ehca_sense_attributes(struct ehca_shca *shca)
        };
        ehca_gen_dbg("Probing adapter %s...",
-                     shca->ofdev->node->full_name);
+                     shca->ofdev->dev.of_node->full_name);
-        loc_code = of_get_property(shca->ofdev->node, "ibm,loc-code", NULL);
+        loc_code = of_get_property(shca->ofdev->dev.of_node, "ibm,loc-code",
+                                   NULL);
        if (loc_code)
                ehca_gen_dbg(" ... location lode=%s", loc_code);
@@ -720,16 +721,16 @@ static int __devinit ehca_probe(struct of_device *dev,
        int ret, i, eq_size;
        unsigned long flags;
-        handle = of_get_property(dev->node, "ibm,hca-handle", NULL);
+        handle = of_get_property(dev->dev.of_node, "ibm,hca-handle", NULL);
        if (!handle) {
                ehca_gen_err("Cannot get eHCA handle for adapter: %s.",
-                             dev->node->full_name);
+                             dev->dev.of_node->full_name);
                return -ENODEV;
        }
        if (!(*handle)) {
                ehca_gen_err("Wrong eHCA handle for adapter: %s.",
-                             dev->node->full_name);
+                             dev->dev.of_node->full_name);
                return -ENODEV;
        }
@@ -936,12 +937,13 @@ static struct of_device_id ehca_device_table[] =
 MODULE_DEVICE_TABLE(of, ehca_device_table);
 static struct of_platform_driver ehca_driver = {
-        .name        = "ehca",
-        .match_table = ehca_device_table,
        .probe       = ehca_probe,
        .remove      = ehca_remove,
-        .driver      = {
+        .driver = {
+                .name = "ehca",
+                .owner = THIS_MODULE,
                .groups = ehca_drv_attr_groups,
+                .of_match_table = ehca_device_table,
        },
 };
diff --git a/drivers/input/misc/sparcspkr.c b/drivers/input/misc/sparcspkr.c
index 0d45422f809..1dacae4b43f 100644
--- a/drivers/input/misc/sparcspkr.c
+++ b/drivers/input/misc/sparcspkr.c
@@ -259,8 +259,11 @@ static const struct of_device_id bbc_beep_match[] = {
 };
 static struct of_platform_driver bbc_beep_driver = {
-        .name           = "bbcbeep",
+        .driver = {
-        .match_table    = bbc_beep_match,
+                .name = "bbcbeep",
+                .owner = THIS_MODULE,
+                .of_match_table = bbc_beep_match,
+        },
        .probe          = bbc_beep_probe,
        .remove         = __devexit_p(bbc_remove),
        .shutdown       = sparcspkr_shutdown,
@@ -338,8 +341,11 @@ static const struct of_device_id grover_beep_match[] = {
 };
 static struct of_platform_driver grover_beep_driver = {
-        .name           = "groverbeep",
+        .driver = {
-        .match_table    = grover_beep_match,
+                .name = "groverbeep",
+                .owner = THIS_MODULE,
+                .of_match_table = grover_beep_match,
+        },
        .probe          = grover_beep_probe,
        .remove         = __devexit_p(grover_remove),
        .shutdown       = sparcspkr_shutdown,
diff --git a/drivers/input/serio/i8042-sparcio.h b/drivers/input/serio/i8042-sparcio.h
index 5071af2c060..04e32f2d124 100644
--- a/drivers/input/serio/i8042-sparcio.h
+++ b/drivers/input/serio/i8042-sparcio.h
@@ -51,7 +51,7 @@ static inline void i8042_write_command(int val)
 static int __devinit sparc_i8042_probe(struct of_device *op, const struct of_device_id *match)
 {
-        struct device_node *dp = op->node;
+        struct device_node *dp = op->dev.of_node;
        dp = dp->child;
        while (dp) {
@@ -96,8 +96,11 @@ static const struct of_device_id sparc_i8042_match[] = {
 MODULE_DEVICE_TABLE(of, sparc_i8042_match);
 static struct of_platform_driver sparc_i8042_driver = {
-        .name           = "i8042",
+        .driver = {
-        .match_table    = sparc_i8042_match,
+                .name = "i8042",
+                .owner = THIS_MODULE,
+                .of_match_table = sparc_i8042_match,
+        },
        .probe          = sparc_i8042_probe,
        .remove         = __devexit_p(sparc_i8042_remove),
 };
diff --git a/drivers/input/serio/xilinx_ps2.c b/drivers/input/serio/xilinx_ps2.c
index f84f8e32e3f..e2c028d2638 100644
--- a/drivers/input/serio/xilinx_ps2.c
+++ b/drivers/input/serio/xilinx_ps2.c
@@ -244,17 +244,17 @@ static int __devinit xps2_of_probe(struct of_device *ofdev,
        int error;
        dev_info(dev, "Device Tree Probing \'%s\'\n",
-                        ofdev->node->name);
+                        ofdev->dev.of_node->name);
        /* Get iospace for the device */
-        error = of_address_to_resource(ofdev->node, 0, &r_mem);
+        error = of_address_to_resource(ofdev->dev.of_node, 0, &r_mem);
        if (error) {
                dev_err(dev, "invalid address\n");
                return error;
        }
        /* Get IRQ for the device */
-        if (of_irq_to_resource(ofdev->node, 0, &r_irq) == NO_IRQ) {
+        if (of_irq_to_resource(ofdev->dev.of_node, 0, &r_irq) == NO_IRQ) {
                dev_err(dev, "no IRQ found\n");
                return -ENODEV;
        }
@@ -342,7 +342,7 @@ static int __devexit xps2_of_remove(struct of_device *of_dev)
        iounmap(drvdata->base_address);
        /* Get iospace of the device */
-        if (of_address_to_resource(of_dev->node, 0, &r_mem))
+        if (of_address_to_resource(of_dev->dev.of_node, 0, &r_mem))
                dev_err(dev, "invalid address\n");
        else
                release_mem_region(r_mem.start, resource_size(&r_mem));
@@ -362,8 +362,11 @@ static const struct of_device_id xps2_of_match[] __devinitconst = {
 MODULE_DEVICE_TABLE(of, xps2_of_match);
 static struct of_platform_driver xps2_of_driver = {
-        .name           = DRIVER_NAME,
+        .driver = {
-        .match_table    = xps2_of_match,
+                .name = DRIVER_NAME,
+                .owner = THIS_MODULE,
+                .of_match_table = xps2_of_match,
+        },
        .probe          = xps2_of_probe,
        .remove         = __devexit_p(xps2_of_remove),
 };
diff --git a/drivers/leds/leds-gpio.c b/drivers/leds/leds-gpio.c
index c6e4b772b75..6d94b0b9979 100644
--- a/drivers/leds/leds-gpio.c
+++ b/drivers/leds/leds-gpio.c
@@ -211,7 +211,7 @@ struct gpio_led_of_platform_data {
 static int __devinit of_gpio_leds_probe(struct of_device *ofdev,
                                        const struct of_device_id *match)
 {
-        struct device_node *np = ofdev->node, *child;
+        struct device_node *np = ofdev->dev.of_node, *child;
        struct gpio_led_of_platform_data *pdata;
        int count = 0, ret;
@@ -291,8 +291,8 @@ static struct of_platform_driver of_gpio_leds_driver = {
        .driver = {
                .name = "of_gpio_leds",
                .owner = THIS_MODULE,
+                .of_match_table = of_gpio_leds_match,
        },
-        .match_table = of_gpio_leds_match,
        .probe = of_gpio_leds_probe,
        .remove = __devexit_p(of_gpio_leds_remove),
 };
diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
index 26a303a1d1a..97147804a49 100644
--- a/drivers/macintosh/macio_asic.c
+++ b/drivers/macintosh/macio_asic.c
@@ -39,14 +39,12 @@ static struct macio_chip      *macio_on_hold;
 static int macio_bus_match(struct device *dev, struct device_driver *drv) 
 {
-        struct macio_dev * macio_dev = to_macio_device(dev);
+        const struct of_device_id * matches = drv->of_match_table;
-        struct macio_driver * macio_drv = to_macio_driver(drv);
-        const struct of_device_id * matches = macio_drv->match_table;
        if (!matches) 
                return 0;
-        return of_match_device(matches, &macio_dev->ofdev) != NULL;
+        return of_match_device(matches, dev) != NULL;
 }
 struct macio_dev *macio_dev_get(struct macio_dev *dev)
@@ -84,7 +82,7 @@ static int macio_device_probe(struct device *dev)
        macio_dev_get(macio_dev);
-        match = of_match_device(drv->match_table, &macio_dev->ofdev);
+        match = of_match_device(drv->driver.of_match_table, dev);
        if (match)
                error = drv->probe(macio_dev, match);
        if (error)
@@ -248,7 +246,7 @@ static void macio_create_fixup_irq(struct macio_dev *dev, int index,
 static void macio_add_missing_resources(struct macio_dev *dev)
 {
-        struct device_node *np = dev->ofdev.node;
+        struct device_node *np = dev->ofdev.dev.of_node;
        unsigned int irq_base;
        /* Gatwick has some missing interrupts on child nodes */
@@ -289,7 +287,7 @@ static void macio_add_missing_resources(struct macio_dev *dev)
 static void macio_setup_interrupts(struct macio_dev *dev)
 {
-        struct device_node *np = dev->ofdev.node;
+        struct device_node *np = dev->ofdev.dev.of_node;
        unsigned int irq;
        int i = 0, j = 0;
@@ -317,7 +315,7 @@ static void macio_setup_interrupts(struct macio_dev *dev)
 static void macio_setup_resources(struct macio_dev *dev,
                                  struct resource *parent_res)
 {
-        struct device_node *np = dev->ofdev.node;
+        struct device_node *np = dev->ofdev.dev.of_node;
        struct resource r;
        int index;
@@ -373,9 +371,9 @@ static struct macio_dev * macio_add_one_device(struct macio_chip *chip,
        dev->bus = &chip->lbus;
        dev->media_bay = in_bay;
-        dev->ofdev.node = np;
+        dev->ofdev.dev.of_node = np;
-        dev->ofdev.dma_mask = 0xffffffffUL;
+        dev->ofdev.archdata.dma_mask = 0xffffffffUL;
-        dev->ofdev.dev.dma_mask = &dev->ofdev.dma_mask;
+        dev->ofdev.dev.dma_mask = &dev->ofdev.archdata.dma_mask;
        dev->ofdev.dev.parent = parent;
        dev->ofdev.dev.bus = &macio_bus_type;
        dev->ofdev.dev.release = macio_release_dev;
@@ -494,9 +492,9 @@ static void macio_pci_add_devices(struct macio_chip *chip)
        }
        /* Add media bay devices if any */
+        pnode = mbdev->ofdev.dev.of_node;
        if (mbdev)
-                for (np = NULL; (np = of_get_next_child(mbdev->ofdev.node, np))
+                for (np = NULL; (np = of_get_next_child(pnode, np)) != NULL;) {
-                             != NULL;) {
                        if (macio_skip_device(np))
                                continue;
                        of_node_get(np);
@@ -506,9 +504,9 @@ static void macio_pci_add_devices(struct macio_chip *chip)
                }
        /* Add serial ports if any */
+        pnode = sdev->ofdev.dev.of_node;
        if (sdev) {
-                for (np = NULL; (np = of_get_next_child(sdev->ofdev.node, np))
+                for (np = NULL; (np = of_get_next_child(pnode, np)) != NULL;) {
-                             != NULL;) {
                        if (macio_skip_device(np))
                                continue;
                        of_node_get(np);
diff --git a/drivers/macintosh/macio_sysfs.c b/drivers/macintosh/macio_sysfs.c
index 9e9453b5842..6999ce59fd1 100644
--- a/drivers/macintosh/macio_sysfs.c
+++ b/drivers/macintosh/macio_sysfs.c
@@ -9,7 +9,7 @@ field##_show (struct device *dev, struct device_attribute *attr,	\
              char *buf)                                                \
 {                                                                       \
        struct macio_dev *mdev = to_macio_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
@@ -21,7 +21,7 @@ compatible_show (struct device *dev, struct device_attribute *attr, char *buf)
        int length = 0;
        of = &to_macio_device (dev)->ofdev;
-        compat = of_get_property(of->node, "compatible", &cplen);
+        compat = of_get_property(of->dev.of_node, "compatible", &cplen);
        if (!compat) {
                *buf = '\0';
                return 0;
@@ -58,7 +58,7 @@ static ssize_t devspec_show(struct device *dev,
        struct of_device *ofdev;
        ofdev = to_of_device(dev);
-        return sprintf(buf, "%s\n", ofdev->node->full_name);
+        return sprintf(buf, "%s\n", ofdev->dev.of_node->full_name);
 }
 macio_config_of_attr (name, "%s\n");
diff --git a/drivers/macintosh/mediabay.c b/drivers/macintosh/mediabay.c
index 08002b88f34..288acce76b7 100644
--- a/drivers/macintosh/mediabay.c
+++ b/drivers/macintosh/mediabay.c
@@ -564,7 +564,7 @@ static int __devinit media_bay_attach(struct macio_dev *mdev, const struct of_de
        unsigned long base;
        int i;
-        ofnode = mdev->ofdev.node;
+        ofnode = mdev->ofdev.dev.of_node;
        if (macio_resource_count(mdev) < 1)
                return -ENODEV;
diff --git a/drivers/macintosh/rack-meter.c b/drivers/macintosh/rack-meter.c
index 7c54d80c4fb..12946c5f583 100644
--- a/drivers/macintosh/rack-meter.c
+++ b/drivers/macintosh/rack-meter.c
@@ -375,7 +375,7 @@ static int __devinit rackmeter_probe(struct macio_dev* mdev,
        pr_debug("rackmeter_probe()\n");
        /* Get i2s-a node */
-        while ((i2s = of_get_next_child(mdev->ofdev.node, i2s)) != NULL)
+        while ((i2s = of_get_next_child(mdev->ofdev.dev.of_node, i2s)) != NULL)
               if (strcmp(i2s->name, "i2s-a") == 0)
                       break;
        if (i2s == NULL) {
@@ -431,7 +431,7 @@ static int __devinit rackmeter_probe(struct macio_dev* mdev,
            of_address_to_resource(i2s, 1, &rdma)) {
                printk(KERN_ERR
                       "rackmeter: found match but lacks resources: %s",
-                       mdev->ofdev.node->full_name);
+                       mdev->ofdev.dev.of_node->full_name);
                rc = -ENXIO;
                goto bail_free;
        }
diff --git a/drivers/macintosh/smu.c b/drivers/macintosh/smu.c
index c9da5c4c167..2506c957712 100644
--- a/drivers/macintosh/smu.c
+++ b/drivers/macintosh/smu.c
@@ -671,8 +671,11 @@ static const struct of_device_id smu_platform_match[] =
 static struct of_platform_driver smu_of_platform_driver =
 {
-        .name           = "smu",
+        .driver = {
-        .match_table    = smu_platform_match,
+                .name = "smu",
+                .owner = THIS_MODULE,
+                .of_match_table = smu_platform_match,
+        },
        .probe          = smu_platform_probe,
 };
diff --git a/drivers/macintosh/therm_pm72.c b/drivers/macintosh/therm_pm72.c
index b18fa948f3d..e60605bd0ea 100644
--- a/drivers/macintosh/therm_pm72.c
+++ b/drivers/macintosh/therm_pm72.c
@@ -2215,7 +2215,7 @@ static int fcu_of_probe(struct of_device* dev, const struct of_device_id *match)
        state = state_detached;
        /* Lookup the fans in the device tree */
-        fcu_lookup_fans(dev->node);
+        fcu_lookup_fans(dev->dev.of_node);
        /* Add the driver */
        return i2c_add_driver(&therm_pm72_driver);
@@ -2238,8 +2238,11 @@ static const struct of_device_id fcu_match[] =
 static struct of_platform_driver fcu_of_platform_driver = 
 {
-        .name           = "temperature",
+        .driver = {
-        .match_table    = fcu_match,
+                .name = "temperature",
+                .owner = THIS_MODULE,
+                .of_match_table = fcu_match,
+        },
        .probe          = fcu_of_probe,
        .remove         = fcu_of_remove
 };
diff --git a/drivers/macintosh/therm_windtunnel.c b/drivers/macintosh/therm_windtunnel.c
index 0839770e4ec..5c9367acf0c 100644
--- a/drivers/macintosh/therm_windtunnel.c
+++ b/drivers/macintosh/therm_windtunnel.c
@@ -463,8 +463,11 @@ static const struct of_device_id therm_of_match[] = {{
 };
 static struct of_platform_driver therm_of_driver = {
-        .name           = "temperature",
+        .driver = {
-        .match_table    = therm_of_match,
+                .name = "temperature",
+                .owner = THIS_MODULE,
+                .of_match_table = therm_of_match,
+        },
        .probe          = therm_of_probe,
        .remove         = therm_of_remove,
 };
diff --git a/drivers/message/fusion/mptscsih.c b/drivers/message/fusion/mptscsih.c
index 7bd4c0fc23c..5c53624e0e8 100644
--- a/drivers/message/fusion/mptscsih.c
+++ b/drivers/message/fusion/mptscsih.c
@@ -2570,9 +2570,7 @@ mptscsih_getclear_scsi_lookup(MPT_ADAPTER *ioc, int i)
 }
 /**
- * mptscsih_set_scsi_lookup
+ * mptscsih_set_scsi_lookup - write a scmd entry into the ScsiLookup[] array list
- *
- * writes a scmd entry into the ScsiLookup[] array list
 *
 * @ioc: Pointer to MPT_ADAPTER structure
 * @i: index into the array
@@ -2735,7 +2733,7 @@ mptscsih_scandv_complete(MPT_ADAPTER *ioc, MPT_FRAME_HDR *req,
 /**
- *      mptscsih_get_completion_code -
+ *      mptscsih_get_completion_code - get completion code from MPT request
 *      @ioc: Pointer to MPT_ADAPTER structure
 *      @req: Pointer to original MPT request frame
 *      @reply: Pointer to MPT reply frame (NULL if TurboReply)
diff --git a/drivers/mfd/Kconfig b/drivers/mfd/Kconfig
index de3e74cde51..3c6a9860dd9 100644
--- a/drivers/mfd/Kconfig
+++ b/drivers/mfd/Kconfig
@@ -49,6 +49,7 @@ config MFD_SH_MOBILE_SDHI
        bool "Support for SuperH Mobile SDHI"
        depends on SUPERH || ARCH_SHMOBILE
        select MFD_CORE
+        select TMIO_MMC_DMA
         ---help---
          This driver supports the SDHI hardware block found in many
          SuperH Mobile SoCs.
@@ -162,6 +163,11 @@ config MFD_TMIO
        bool
        default n
+config TMIO_MMC_DMA
+        bool
+        select DMA_ENGINE
+        select DMADEVICES
 config MFD_T7L66XB
        bool "Support Toshiba T7L66XB"
        depends on ARM && HAVE_CLK
diff --git a/drivers/mfd/sh_mobile_sdhi.c b/drivers/mfd/sh_mobile_sdhi.c
index 497f91b6138..cd164595f08 100644
--- a/drivers/mfd/sh_mobile_sdhi.c
+++ b/drivers/mfd/sh_mobile_sdhi.c
@@ -26,11 +26,15 @@
 #include <linux/mfd/core.h>
 #include <linux/mfd/tmio.h>
 #include <linux/mfd/sh_mobile_sdhi.h>
+#include <linux/sh_dma.h>
 struct sh_mobile_sdhi {
        struct clk *clk;
        struct tmio_mmc_data mmc_data;
        struct mfd_cell cell_mmc;
+        struct sh_dmae_slave param_tx;
+        struct sh_dmae_slave param_rx;
+        struct tmio_mmc_dma dma_priv;
 };
 static struct resource sh_mobile_sdhi_resources[] = {
@@ -64,6 +68,8 @@ static void sh_mobile_sdhi_set_pwr(struct platform_device *tmio, int state)
 static int __init sh_mobile_sdhi_probe(struct platform_device *pdev)
 {
        struct sh_mobile_sdhi *priv;
+        struct tmio_mmc_data *mmc_data;
+        struct sh_mobile_sdhi_info *p = pdev->dev.platform_data;
        struct resource *mem;
        char clk_name[8];
        int ret, irq;
@@ -85,6 +91,8 @@ static int __init sh_mobile_sdhi_probe(struct platform_device *pdev)
                return -ENOMEM;
        }
+        mmc_data = &priv->mmc_data;
        snprintf(clk_name, sizeof(clk_name), "sdhi%d", pdev->id);
        priv->clk = clk_get(&pdev->dev, clk_name);
        if (IS_ERR(priv->clk)) {
@@ -96,12 +104,24 @@ static int __init sh_mobile_sdhi_probe(struct platform_device *pdev)
        clk_enable(priv->clk);
-        priv->mmc_data.hclk = clk_get_rate(priv->clk);
+        mmc_data->hclk = clk_get_rate(priv->clk);
-        priv->mmc_data.set_pwr = sh_mobile_sdhi_set_pwr;
+        mmc_data->set_pwr = sh_mobile_sdhi_set_pwr;
-        priv->mmc_data.capabilities = MMC_CAP_MMC_HIGHSPEED;
+        mmc_data->capabilities = MMC_CAP_MMC_HIGHSPEED;
+        if (p) {
+                mmc_data->flags = p->tmio_flags;
+                mmc_data->ocr_mask = p->tmio_ocr_mask;
+        }
+        if (p && p->dma_slave_tx >= 0 && p->dma_slave_rx >= 0) {
+                priv->param_tx.slave_id = p->dma_slave_tx;
+                priv->param_rx.slave_id = p->dma_slave_rx;
+                priv->dma_priv.chan_priv_tx = &priv->param_tx;
+                priv->dma_priv.chan_priv_rx = &priv->param_rx;
+                mmc_data->dma = &priv->dma_priv;
+        }
        memcpy(&priv->cell_mmc, &sh_mobile_sdhi_cell, sizeof(priv->cell_mmc));
-        priv->cell_mmc.driver_data = &priv->mmc_data;
+        priv->cell_mmc.driver_data = mmc_data;
        priv->cell_mmc.platform_data = &priv->cell_mmc;
        priv->cell_mmc.data_size = sizeof(priv->cell_mmc);
diff --git a/drivers/mmc/host/of_mmc_spi.c b/drivers/mmc/host/of_mmc_spi.c
index bb6cc54b558..1247e5de9fa 100644
--- a/drivers/mmc/host/of_mmc_spi.c
+++ b/drivers/mmc/host/of_mmc_spi.c
@@ -64,7 +64,7 @@ static int of_mmc_spi_get_ro(struct device *dev)
 struct mmc_spi_platform_data *mmc_spi_get_pdata(struct spi_device *spi)
 {
        struct device *dev = &spi->dev;
-        struct device_node *np = dev_archdata_get_node(&dev->archdata);
+        struct device_node *np = dev->of_node;
        struct of_mmc_spi *oms;
        const u32 *voltage_ranges;
        int num_ranges;
@@ -135,7 +135,7 @@ EXPORT_SYMBOL(mmc_spi_get_pdata);
 void mmc_spi_put_pdata(struct spi_device *spi)
 {
        struct device *dev = &spi->dev;
-        struct device_node *np = dev_archdata_get_node(&dev->archdata);
+        struct device_node *np = dev->of_node;
        struct of_mmc_spi *oms = to_of_mmc_spi(dev);
        int i;
diff --git a/drivers/mmc/host/sdhci-of-core.c b/drivers/mmc/host/sdhci-of-core.c
index 55e33135edb..7802a543d8f 100644
--- a/drivers/mmc/host/sdhci-of-core.c
+++ b/drivers/mmc/host/sdhci-of-core.c
@@ -118,7 +118,7 @@ static bool __devinit sdhci_of_wp_inverted(struct device_node *np)
 static int __devinit sdhci_of_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 sdhci_of_data *sdhci_of_data = match->data;
        struct sdhci_host *host;
        struct sdhci_of_host *of_host;
@@ -205,8 +205,11 @@ static const struct of_device_id sdhci_of_match[] = {
 MODULE_DEVICE_TABLE(of, sdhci_of_match);
 static struct of_platform_driver sdhci_of_driver = {
-        .driver.name = "sdhci-of",
+        .driver = {
-        .match_table = sdhci_of_match,
+                .name = "sdhci-of",
+                .owner = THIS_MODULE,
+                .of_match_table = sdhci_of_match,
+        },
        .probe = sdhci_of_probe,
        .remove = __devexit_p(sdhci_of_remove),
        .suspend = sdhci_of_suspend,
diff --git a/drivers/mmc/host/tmio_mmc.c b/drivers/mmc/host/tmio_mmc.c
index b2b577f6afd..883fcac2100 100644
--- a/drivers/mmc/host/tmio_mmc.c
+++ b/drivers/mmc/host/tmio_mmc.c
@@ -29,6 +29,7 @@
 #include <linux/irq.h>
 #include <linux/device.h>
 #include <linux/delay.h>
+#include <linux/dmaengine.h>
 #include <linux/mmc/host.h>
 #include <linux/mfd/core.h>
 #include <linux/mfd/tmio.h>
@@ -131,8 +132,8 @@ tmio_mmc_start_command(struct tmio_mmc_host *host, struct mmc_command *cmd)
        host->cmd = cmd;
-/* FIXME - this seems to be ok comented out but the spec suggest this bit should
+/* FIXME - this seems to be ok commented out but the spec suggest this bit
- *         be set when issuing app commands.
+ *         should be set when issuing app commands.
 *      if(cmd->flags & MMC_FLAG_ACMD)
 *              c |= APP_CMD;
 */
@@ -155,12 +156,12 @@ tmio_mmc_start_command(struct tmio_mmc_host *host, struct mmc_command *cmd)
        return 0;
 }
-/* This chip always returns (at least?) as much data as you ask for.
+/*
+ * This chip always returns (at least?) as much data as you ask for.
 * I'm unsure what happens if you ask for less than a block. This should be
 * looked into to ensure that a funny length read doesnt hose the controller.
- *
 */
-static inline void tmio_mmc_pio_irq(struct tmio_mmc_host *host)
+static void tmio_mmc_pio_irq(struct tmio_mmc_host *host)
 {
        struct mmc_data *data = host->data;
        unsigned short *buf;
@@ -180,7 +181,7 @@ static inline void tmio_mmc_pio_irq(struct tmio_mmc_host *host)
                count = data->blksz;
        pr_debug("count: %08x offset: %08x flags %08x\n",
-            count, host->sg_off, data->flags);
+                 count, host->sg_off, data->flags);
        /* Transfer the data */
        if (data->flags & MMC_DATA_READ)
@@ -198,7 +199,7 @@ static inline void tmio_mmc_pio_irq(struct tmio_mmc_host *host)
        return;
 }
-static inline void tmio_mmc_data_irq(struct tmio_mmc_host *host)
+static void tmio_mmc_do_data_irq(struct tmio_mmc_host *host)
 {
        struct mmc_data *data = host->data;
        struct mmc_command *stop;
@@ -206,7 +207,7 @@ static inline void tmio_mmc_data_irq(struct tmio_mmc_host *host)
        host->data = NULL;
        if (!data) {
-                pr_debug("Spurious data end IRQ\n");
+                dev_warn(&host->pdev->dev, "Spurious data end IRQ\n");
                return;
        }
        stop = data->stop;
@@ -219,7 +220,8 @@ static inline void tmio_mmc_data_irq(struct tmio_mmc_host *host)
        pr_debug("Completed data request\n");
-        /*FIXME - other drivers allow an optional stop command of any given type
+        /*
+         * FIXME: other drivers allow an optional stop command of any given type
         *        which we dont do, as the chip can auto generate them.
         *        Perhaps we can be smarter about when to use auto CMD12 and
         *        only issue the auto request when we know this is the desired
@@ -227,10 +229,17 @@ static inline void tmio_mmc_data_irq(struct tmio_mmc_host *host)
         *        upper layers expect. For now, we do what works.
         */
-        if (data->flags & MMC_DATA_READ)
+        if (data->flags & MMC_DATA_READ) {
-                disable_mmc_irqs(host, TMIO_MASK_READOP);
+                if (!host->chan_rx)
-        else
+                        disable_mmc_irqs(host, TMIO_MASK_READOP);
-                disable_mmc_irqs(host, TMIO_MASK_WRITEOP);
+                dev_dbg(&host->pdev->dev, "Complete Rx request %p\n",
+                        host->mrq);
+        } else {
+                if (!host->chan_tx)
+                        disable_mmc_irqs(host, TMIO_MASK_WRITEOP);
+                dev_dbg(&host->pdev->dev, "Complete Tx request %p\n",
+                        host->mrq);
+        }
        if (stop) {
                if (stop->opcode == 12 && !stop->arg)
@@ -242,7 +251,35 @@ static inline void tmio_mmc_data_irq(struct tmio_mmc_host *host)
        tmio_mmc_finish_request(host);
 }
-static inline void tmio_mmc_cmd_irq(struct tmio_mmc_host *host,
+static void tmio_mmc_data_irq(struct tmio_mmc_host *host)
+{
+        struct mmc_data *data = host->data;
+        if (!data)
+                return;
+        if (host->chan_tx && (data->flags & MMC_DATA_WRITE)) {
+                /*
+                 * Has all data been written out yet? Testing on SuperH showed,
+                 * that in most cases the first interrupt comes already with the
+                 * BUSY status bit clear, but on some operations, like mount or
+                 * in the beginning of a write / sync / umount, there is one
+                 * DATAEND interrupt with the BUSY bit set, in this cases
+                 * waiting for one more interrupt fixes the problem.
+                 */
+                if (!(sd_ctrl_read32(host, CTL_STATUS) & TMIO_STAT_CMD_BUSY)) {
+                        disable_mmc_irqs(host, TMIO_STAT_DATAEND);
+                        tasklet_schedule(&host->dma_complete);
+                }
+        } else if (host->chan_rx && (data->flags & MMC_DATA_READ)) {
+                disable_mmc_irqs(host, TMIO_STAT_DATAEND);
+                tasklet_schedule(&host->dma_complete);
+        } else {
+                tmio_mmc_do_data_irq(host);
+        }
+}
+static void tmio_mmc_cmd_irq(struct tmio_mmc_host *host,
        unsigned int stat)
 {
        struct mmc_command *cmd = host->cmd;
@@ -282,10 +319,16 @@ static inline void tmio_mmc_cmd_irq(struct tmio_mmc_host *host,
         * If theres no data or we encountered an error, finish now.
         */
        if (host->data && !cmd->error) {
-                if (host->data->flags & MMC_DATA_READ)
+                if (host->data->flags & MMC_DATA_READ) {
-                        enable_mmc_irqs(host, TMIO_MASK_READOP);
+                        if (!host->chan_rx)
-                else
+                                enable_mmc_irqs(host, TMIO_MASK_READOP);
-                        enable_mmc_irqs(host, TMIO_MASK_WRITEOP);
+                } else {
+                        struct dma_chan *chan = host->chan_tx;
+                        if (!chan)
+                                enable_mmc_irqs(host, TMIO_MASK_WRITEOP);
+                        else
+                                tasklet_schedule(&host->dma_issue);
+                }
        } else {
                tmio_mmc_finish_request(host);
        }
@@ -293,7 +336,6 @@ static inline void tmio_mmc_cmd_irq(struct tmio_mmc_host *host,
        return;
 }
 static irqreturn_t tmio_mmc_irq(int irq, void *devid)
 {
        struct tmio_mmc_host *host = devid;
@@ -311,7 +353,7 @@ static irqreturn_t tmio_mmc_irq(int irq, void *devid)
        if (!ireg) {
                disable_mmc_irqs(host, status & ~irq_mask);
-                pr_debug("tmio_mmc: Spurious irq, disabling! "
+                pr_warning("tmio_mmc: Spurious irq, disabling! "
                        "0x%08x 0x%08x 0x%08x\n", status, irq_mask, ireg);
                pr_debug_status(status);
@@ -363,16 +405,265 @@ out:
        return IRQ_HANDLED;
 }
+#ifdef CONFIG_TMIO_MMC_DMA
+static void tmio_mmc_enable_dma(struct tmio_mmc_host *host, bool enable)
+{
+#if defined(CONFIG_SUPERH) || defined(CONFIG_ARCH_SHMOBILE)
+        /* Switch DMA mode on or off - SuperH specific? */
+        sd_ctrl_write16(host, 0xd8, enable ? 2 : 0);
+#endif
+}
+static void tmio_dma_complete(void *arg)
+{
+        struct tmio_mmc_host *host = arg;
+        dev_dbg(&host->pdev->dev, "Command completed\n");
+        if (!host->data)
+                dev_warn(&host->pdev->dev, "NULL data in DMA completion!\n");
+        else
+                enable_mmc_irqs(host, TMIO_STAT_DATAEND);
+}
+static int tmio_mmc_start_dma_rx(struct tmio_mmc_host *host)
+{
+        struct scatterlist *sg = host->sg_ptr;
+        struct dma_async_tx_descriptor *desc = NULL;
+        struct dma_chan *chan = host->chan_rx;
+        int ret;
+        ret = dma_map_sg(&host->pdev->dev, sg, host->sg_len, DMA_FROM_DEVICE);
+        if (ret > 0) {
+                host->dma_sglen = ret;
+                desc = chan->device->device_prep_slave_sg(chan, sg, ret,
+                        DMA_FROM_DEVICE, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
+        }
+        if (desc) {
+                host->desc = desc;
+                desc->callback = tmio_dma_complete;
+                desc->callback_param = host;
+                host->cookie = desc->tx_submit(desc);
+                if (host->cookie < 0) {
+                        host->desc = NULL;
+                        ret = host->cookie;
+                } else {
+                        chan->device->device_issue_pending(chan);
+                }
+        }
+        dev_dbg(&host->pdev->dev, "%s(): mapped %d -> %d, cookie %d, rq %p\n",
+                __func__, host->sg_len, ret, host->cookie, host->mrq);
+        if (!host->desc) {
+                /* DMA failed, fall back to PIO */
+                if (ret >= 0)
+                        ret = -EIO;
+                host->chan_rx = NULL;
+                dma_release_channel(chan);
+                /* Free the Tx channel too */
+                chan = host->chan_tx;
+                if (chan) {
+                        host->chan_tx = NULL;
+                        dma_release_channel(chan);
+                }
+                dev_warn(&host->pdev->dev,
+                         "DMA failed: %d, falling back to PIO\n", ret);
+                tmio_mmc_enable_dma(host, false);
+                reset(host);
+                /* Fail this request, let above layers recover */
+                host->mrq->cmd->error = ret;
+                tmio_mmc_finish_request(host);
+        }
+        dev_dbg(&host->pdev->dev, "%s(): desc %p, cookie %d, sg[%d]\n", __func__,
+                desc, host->cookie, host->sg_len);
+        return ret > 0 ? 0 : ret;
+}
+static int tmio_mmc_start_dma_tx(struct tmio_mmc_host *host)
+{
+        struct scatterlist *sg = host->sg_ptr;
+        struct dma_async_tx_descriptor *desc = NULL;
+        struct dma_chan *chan = host->chan_tx;
+        int ret;
+        ret = dma_map_sg(&host->pdev->dev, sg, host->sg_len, DMA_TO_DEVICE);
+        if (ret > 0) {
+                host->dma_sglen = ret;
+                desc = chan->device->device_prep_slave_sg(chan, sg, ret,
+                        DMA_TO_DEVICE, DMA_PREP_INTERRUPT | DMA_CTRL_ACK);
+        }
+        if (desc) {
+                host->desc = desc;
+                desc->callback = tmio_dma_complete;
+                desc->callback_param = host;
+                host->cookie = desc->tx_submit(desc);
+                if (host->cookie < 0) {
+                        host->desc = NULL;
+                        ret = host->cookie;
+                }
+        }
+        dev_dbg(&host->pdev->dev, "%s(): mapped %d -> %d, cookie %d, rq %p\n",
+                __func__, host->sg_len, ret, host->cookie, host->mrq);
+        if (!host->desc) {
+                /* DMA failed, fall back to PIO */
+                if (ret >= 0)
+                        ret = -EIO;
+                host->chan_tx = NULL;
+                dma_release_channel(chan);
+                /* Free the Rx channel too */
+                chan = host->chan_rx;
+                if (chan) {
+                        host->chan_rx = NULL;
+                        dma_release_channel(chan);
+                }
+                dev_warn(&host->pdev->dev,
+                         "DMA failed: %d, falling back to PIO\n", ret);
+                tmio_mmc_enable_dma(host, false);
+                reset(host);
+                /* Fail this request, let above layers recover */
+                host->mrq->cmd->error = ret;
+                tmio_mmc_finish_request(host);
+        }
+        dev_dbg(&host->pdev->dev, "%s(): desc %p, cookie %d\n", __func__,
+                desc, host->cookie);
+        return ret > 0 ? 0 : ret;
+}
+static int tmio_mmc_start_dma(struct tmio_mmc_host *host,
+                               struct mmc_data *data)
+{
+        if (data->flags & MMC_DATA_READ) {
+                if (host->chan_rx)
+                        return tmio_mmc_start_dma_rx(host);
+        } else {
+                if (host->chan_tx)
+                        return tmio_mmc_start_dma_tx(host);
+        }
+        return 0;
+}
+static void tmio_issue_tasklet_fn(unsigned long priv)
+{
+        struct tmio_mmc_host *host = (struct tmio_mmc_host *)priv;
+        struct dma_chan *chan = host->chan_tx;
+        chan->device->device_issue_pending(chan);
+}
+static void tmio_tasklet_fn(unsigned long arg)
+{
+        struct tmio_mmc_host *host = (struct tmio_mmc_host *)arg;
+        if (host->data->flags & MMC_DATA_READ)
+                dma_unmap_sg(&host->pdev->dev, host->sg_ptr, host->dma_sglen,
+                             DMA_FROM_DEVICE);
+        else
+                dma_unmap_sg(&host->pdev->dev, host->sg_ptr, host->dma_sglen,
+                             DMA_TO_DEVICE);
+        tmio_mmc_do_data_irq(host);
+}
+/* It might be necessary to make filter MFD specific */
+static bool tmio_mmc_filter(struct dma_chan *chan, void *arg)
+{
+        dev_dbg(chan->device->dev, "%s: slave data %p\n", __func__, arg);
+        chan->private = arg;
+        return true;
+}
+static void tmio_mmc_request_dma(struct tmio_mmc_host *host,
+                                 struct tmio_mmc_data *pdata)
+{
+        host->cookie = -EINVAL;
+        host->desc = NULL;
+        /* We can only either use DMA for both Tx and Rx or not use it at all */
+        if (pdata->dma) {
+                dma_cap_mask_t mask;
+                dma_cap_zero(mask);
+                dma_cap_set(DMA_SLAVE, mask);
+                host->chan_tx = dma_request_channel(mask, tmio_mmc_filter,
+                                                    pdata->dma->chan_priv_tx);
+                dev_dbg(&host->pdev->dev, "%s: TX: got channel %p\n", __func__,
+                        host->chan_tx);
+                if (!host->chan_tx)
+                        return;
+                host->chan_rx = dma_request_channel(mask, tmio_mmc_filter,
+                                                    pdata->dma->chan_priv_rx);
+                dev_dbg(&host->pdev->dev, "%s: RX: got channel %p\n", __func__,
+                        host->chan_rx);
+                if (!host->chan_rx) {
+                        dma_release_channel(host->chan_tx);
+                        host->chan_tx = NULL;
+                        return;
+                }
+                tasklet_init(&host->dma_complete, tmio_tasklet_fn, (unsigned long)host);
+                tasklet_init(&host->dma_issue, tmio_issue_tasklet_fn, (unsigned long)host);
+                tmio_mmc_enable_dma(host, true);
+        }
+}
+static void tmio_mmc_release_dma(struct tmio_mmc_host *host)
+{
+        if (host->chan_tx) {
+                struct dma_chan *chan = host->chan_tx;
+                host->chan_tx = NULL;
+                dma_release_channel(chan);
+        }
+        if (host->chan_rx) {
+                struct dma_chan *chan = host->chan_rx;
+                host->chan_rx = NULL;
+                dma_release_channel(chan);
+        }
+        host->cookie = -EINVAL;
+        host->desc = NULL;
+}
+#else
+static int tmio_mmc_start_dma(struct tmio_mmc_host *host,
+                               struct mmc_data *data)
+{
+        return 0;
+}
+static void tmio_mmc_request_dma(struct tmio_mmc_host *host,
+                                 struct tmio_mmc_data *pdata)
+{
+        host->chan_tx = NULL;
+        host->chan_rx = NULL;
+}
+static void tmio_mmc_release_dma(struct tmio_mmc_host *host)
+{
+}
+#endif
 static int tmio_mmc_start_data(struct tmio_mmc_host *host,
        struct mmc_data *data)
 {
        pr_debug("setup data transfer: blocksize %08x  nr_blocks %d\n",
-            data->blksz, data->blocks);
+                 data->blksz, data->blocks);
        /* Hardware cannot perform 1 and 2 byte requests in 4 bit mode */
        if (data->blksz < 4 && host->mmc->ios.bus_width == MMC_BUS_WIDTH_4) {
-                printk(KERN_ERR "%s: %d byte block unsupported in 4 bit mode\n",
+                pr_err("%s: %d byte block unsupported in 4 bit mode\n",
-                        mmc_hostname(host->mmc), data->blksz);
+                       mmc_hostname(host->mmc), data->blksz);
                return -EINVAL;
        }
@@ -383,7 +674,7 @@ static int tmio_mmc_start_data(struct tmio_mmc_host *host,
        sd_ctrl_write16(host, CTL_SD_XFER_LEN, data->blksz);
        sd_ctrl_write16(host, CTL_XFER_BLK_COUNT, data->blocks);
-        return 0;
+        return tmio_mmc_start_dma(host, data);
 }
 /* Process requests from the MMC layer */
@@ -404,7 +695,6 @@ static void tmio_mmc_request(struct mmc_host *mmc, struct mmc_request *mrq)
        }
        ret = tmio_mmc_start_command(host, mrq->cmd);
        if (!ret)
                return;
@@ -458,11 +748,14 @@ static void tmio_mmc_set_ios(struct mmc_host *mmc, struct mmc_ios *ios)
 static int tmio_mmc_get_ro(struct mmc_host *mmc)
 {
        struct tmio_mmc_host *host = mmc_priv(mmc);
+        struct mfd_cell *cell = host->pdev->dev.platform_data;
+        struct tmio_mmc_data *pdata = cell->driver_data;
-        return (sd_ctrl_read16(host, CTL_STATUS) & TMIO_STAT_WRPROTECT) ? 0 : 1;
+        return ((pdata->flags & TMIO_MMC_WRPROTECT_DISABLE) ||
+                (sd_ctrl_read32(host, CTL_STATUS) & TMIO_STAT_WRPROTECT)) ? 0 : 1;
 }
-static struct mmc_host_ops tmio_mmc_ops = {
+static const struct mmc_host_ops tmio_mmc_ops = {
        .request        = tmio_mmc_request,
        .set_ios        = tmio_mmc_set_ios,
        .get_ro         = tmio_mmc_get_ro,
@@ -515,6 +808,7 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev)
        struct tmio_mmc_host *host;
        struct mmc_host *mmc;
        int ret = -EINVAL;
+        u32 irq_mask = TMIO_MASK_CMD;
        if (dev->num_resources != 2)
                goto out;
@@ -553,7 +847,10 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev)
        mmc->caps |= pdata->capabilities;
        mmc->f_max = pdata->hclk;
        mmc->f_min = mmc->f_max / 512;
-        mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
+        if (pdata->ocr_mask)
+                mmc->ocr_avail = pdata->ocr_mask;
+        else
+                mmc->ocr_avail = MMC_VDD_32_33 | MMC_VDD_33_34;
        /* Tell the MFD core we are ready to be enabled */
        if (cell->enable) {
@@ -578,13 +875,20 @@ static int __devinit tmio_mmc_probe(struct platform_device *dev)
        if (ret)
                goto cell_disable;
+        /* See if we also get DMA */
+        tmio_mmc_request_dma(host, pdata);
        mmc_add_host(mmc);
-        printk(KERN_INFO "%s at 0x%08lx irq %d\n", mmc_hostname(host->mmc),
+        pr_info("%s at 0x%08lx irq %d\n", mmc_hostname(host->mmc),
-               (unsigned long)host->ctl, host->irq);
+                (unsigned long)host->ctl, host->irq);
        /* Unmask the IRQs we want to know about */
-        enable_mmc_irqs(host, TMIO_MASK_IRQ);
+        if (!host->chan_rx)
+                irq_mask |= TMIO_MASK_READOP;
+        if (!host->chan_tx)
+                irq_mask |= TMIO_MASK_WRITEOP;
+        enable_mmc_irqs(host, irq_mask);
        return 0;
@@ -609,6 +913,7 @@ static int __devexit tmio_mmc_remove(struct platform_device *dev)
        if (mmc) {
                struct tmio_mmc_host *host = mmc_priv(mmc);
                mmc_remove_host(mmc);
+                tmio_mmc_release_dma(host);
                free_irq(host->irq, host);
                if (cell->disable)
                        cell->disable(dev);
diff --git a/drivers/mmc/host/tmio_mmc.h b/drivers/mmc/host/tmio_mmc.h
index dafecfbcd91..64f7d5dfc10 100644
--- a/drivers/mmc/host/tmio_mmc.h
+++ b/drivers/mmc/host/tmio_mmc.h
@@ -10,6 +10,8 @@
 */
 #include <linux/highmem.h>
+#include <linux/interrupt.h>
+#include <linux/dmaengine.h>
 #define CTL_SD_CMD 0x00
 #define CTL_ARG_REG 0x04
@@ -106,6 +108,17 @@ struct tmio_mmc_host {
        unsigned int            sg_off;
        struct platform_device *pdev;
+        /* DMA support */
+        struct dma_chan         *chan_rx;
+        struct dma_chan         *chan_tx;
+        struct tasklet_struct   dma_complete;
+        struct tasklet_struct   dma_issue;
+#ifdef CONFIG_TMIO_MMC_DMA
+        struct dma_async_tx_descriptor *desc;
+        unsigned int            dma_sglen;
+        dma_cookie_t            cookie;
+#endif
 };
 #include <linux/io.h>
diff --git a/drivers/mtd/maps/physmap_of.c b/drivers/mtd/maps/physmap_of.c
index 36dbcee1ac2..ba124baa646 100644
--- a/drivers/mtd/maps/physmap_of.c
+++ b/drivers/mtd/maps/physmap_of.c
@@ -143,7 +143,7 @@ static int of_flash_remove(struct of_device *dev)
 static struct mtd_info * __devinit obsolete_probe(struct of_device *dev,
                                                  struct map_info *map)
 {
-        struct device_node *dp = dev->node;
+        struct device_node *dp = dev->dev.of_node;
        const char *of_probe;
        struct mtd_info *mtd;
        static const char *rom_probe_types[]
@@ -221,7 +221,7 @@ static int __devinit of_flash_probe(struct of_device *dev,
 #ifdef CONFIG_MTD_PARTITIONS
        const char **part_probe_types;
 #endif
-        struct device_node *dp = dev->node;
+        struct device_node *dp = dev->dev.of_node;
        struct resource res;
        struct of_flash *info;
        const char *probe_type = match->data;
@@ -245,7 +245,7 @@ static int __devinit of_flash_probe(struct of_device *dev,
        p = of_get_property(dp, "reg", &count);
        if (count % reg_tuple_size != 0) {
                dev_err(&dev->dev, "Malformed reg property on %s\n",
-                                dev->node->full_name);
+                                dev->dev.of_node->full_name);
                err = -EINVAL;
                goto err_flash_remove;
        }
@@ -418,8 +418,11 @@ static struct of_device_id of_flash_match[] = {
 MODULE_DEVICE_TABLE(of, of_flash_match);
 static struct of_platform_driver of_flash_driver = {
-        .name           = "of-flash",
+        .driver = {
-        .match_table    = of_flash_match,
+                .name = "of-flash",
+                .owner = THIS_MODULE,
+                .of_match_table = of_flash_match,
+        },
        .probe          = of_flash_probe,
        .remove         = of_flash_remove,
 };
diff --git a/drivers/mtd/maps/sun_uflash.c b/drivers/mtd/maps/sun_uflash.c
index fadc4c45b45..0391c2527bd 100644
--- a/drivers/mtd/maps/sun_uflash.c
+++ b/drivers/mtd/maps/sun_uflash.c
@@ -110,7 +110,7 @@ int uflash_devinit(struct of_device *op, struct device_node *dp)
 static int __devinit uflash_probe(struct of_device *op, const struct of_device_id *match)
 {
-        struct device_node *dp = op->node;
+        struct device_node *dp = op->dev.of_node;
        /* Flashprom must have the "user" property in order to
         * be used by this driver.
@@ -149,8 +149,11 @@ static const struct of_device_id uflash_match[] = {
 MODULE_DEVICE_TABLE(of, uflash_match);
 static struct of_platform_driver uflash_driver = {
-        .name           = DRIVER_NAME,
+        .driver = {
-        .match_table    = uflash_match,
+                .name = DRIVER_NAME,
+                .owner = THIS_MODULE,
+                .of_match_table = uflash_match,
+        },
        .probe          = uflash_probe,
        .remove         = __devexit_p(uflash_remove),
 };
diff --git a/drivers/mtd/nand/fsl_elbc_nand.c b/drivers/mtd/nand/fsl_elbc_nand.c
index 3f38fb8e666..5084cc51794 100644
--- a/drivers/mtd/nand/fsl_elbc_nand.c
+++ b/drivers/mtd/nand/fsl_elbc_nand.c
@@ -1030,14 +1030,14 @@ static int __devinit fsl_elbc_ctrl_probe(struct of_device *ofdev,
        init_waitqueue_head(&ctrl->controller.wq);
        init_waitqueue_head(&ctrl->irq_wait);
-        ctrl->regs = of_iomap(ofdev->node, 0);
+        ctrl->regs = of_iomap(ofdev->dev.of_node, 0);
        if (!ctrl->regs) {
                dev_err(&ofdev->dev, "failed to get memory region\n");
                ret = -ENODEV;
                goto err;
        }
-        ctrl->irq = of_irq_to_resource(ofdev->node, 0, NULL);
+        ctrl->irq = of_irq_to_resource(ofdev->dev.of_node, 0, NULL);
        if (ctrl->irq == NO_IRQ) {
                dev_err(&ofdev->dev, "failed to get irq resource\n");
                ret = -ENODEV;
@@ -1058,7 +1058,7 @@ static int __devinit fsl_elbc_ctrl_probe(struct of_device *ofdev,
                goto err;
        }
-        for_each_child_of_node(ofdev->node, child)
+        for_each_child_of_node(ofdev->dev.of_node, child)
                if (of_device_is_compatible(child, "fsl,elbc-fcm-nand"))
                        fsl_elbc_chip_probe(ctrl, child);
@@ -1078,9 +1078,10 @@ static const struct of_device_id fsl_elbc_match[] = {
 static struct of_platform_driver fsl_elbc_ctrl_driver = {
        .driver = {
-                .name   = "fsl-elbc",
+                .name = "fsl-elbc",
+                .owner = THIS_MODULE,
+                .of_match_table = fsl_elbc_match,
        },
-        .match_table = fsl_elbc_match,
        .probe = fsl_elbc_ctrl_probe,
        .remove = fsl_elbc_ctrl_remove,
 };
diff --git a/drivers/mtd/nand/fsl_upm.c b/drivers/mtd/nand/fsl_upm.c
index 2d215ccb564..00aea6f7d1f 100644
--- a/drivers/mtd/nand/fsl_upm.c
+++ b/drivers/mtd/nand/fsl_upm.c
@@ -360,8 +360,11 @@ static const struct of_device_id of_fun_match[] = {
 MODULE_DEVICE_TABLE(of, of_fun_match);
 static struct of_platform_driver of_fun_driver = {
-        .name           = "fsl,upm-nand",
+        .driver = {
-        .match_table    = of_fun_match,
+                .name = "fsl,upm-nand",
+                .owner = THIS_MODULE,
+                .of_match_table = of_fun_match,
+        },
        .probe          = fun_probe,
        .remove         = __devexit_p(fun_remove),
 };
diff --git a/drivers/mtd/nand/ndfc.c b/drivers/mtd/nand/ndfc.c
index b983cae8c29..98fd2bdf8be 100644
--- a/drivers/mtd/nand/ndfc.c
+++ b/drivers/mtd/nand/ndfc.c
@@ -239,14 +239,14 @@ static int __devinit ndfc_probe(struct of_device *ofdev,
        dev_set_drvdata(&ofdev->dev, ndfc);
        /* Read the reg property to get the chip select */
-        reg = of_get_property(ofdev->node, "reg", &len);
+        reg = of_get_property(ofdev->dev.of_node, "reg", &len);
        if (reg == NULL || len != 12) {
                dev_err(&ofdev->dev, "unable read reg property (%d)\n", len);
                return -ENOENT;
        }
        ndfc->chip_select = reg[0];
-        ndfc->ndfcbase = of_iomap(ofdev->node, 0);
+        ndfc->ndfcbase = of_iomap(ofdev->dev.of_node, 0);
        if (!ndfc->ndfcbase) {
                dev_err(&ofdev->dev, "failed to get memory\n");
                return -EIO;
@@ -255,20 +255,20 @@ static int __devinit ndfc_probe(struct of_device *ofdev,
        ccr = NDFC_CCR_BS(ndfc->chip_select);
        /* It is ok if ccr does not exist - just default to 0 */
-        reg = of_get_property(ofdev->node, "ccr", NULL);
+        reg = of_get_property(ofdev->dev.of_node, "ccr", NULL);
        if (reg)
                ccr |= *reg;
        out_be32(ndfc->ndfcbase + NDFC_CCR, ccr);
        /* Set the bank settings if given */
-        reg = of_get_property(ofdev->node, "bank-settings", NULL);
+        reg = of_get_property(ofdev->dev.of_node, "bank-settings", NULL);
        if (reg) {
                int offset = NDFC_BCFG0 + (ndfc->chip_select << 2);
                out_be32(ndfc->ndfcbase + offset, *reg);
        }
-        err = ndfc_chip_init(ndfc, ofdev->node);
+        err = ndfc_chip_init(ndfc, ofdev->dev.of_node);
        if (err) {
                iounmap(ndfc->ndfcbase);
                return err;
@@ -294,9 +294,10 @@ MODULE_DEVICE_TABLE(of, ndfc_match);
 static struct of_platform_driver ndfc_driver = {
        .driver = {
-                .name   = "ndfc",
+                .name = "ndfc",
+                .owner = THIS_MODULE,
+                .of_match_table = ndfc_match,
        },
-        .match_table = ndfc_match,
        .probe = ndfc_probe,
        .remove = __devexit_p(ndfc_remove),
 };
diff --git a/drivers/mtd/nand/pasemi_nand.c b/drivers/mtd/nand/pasemi_nand.c
index 090a05c12cb..f02af24d033 100644
--- a/drivers/mtd/nand/pasemi_nand.c
+++ b/drivers/mtd/nand/pasemi_nand.c
@@ -93,7 +93,7 @@ static int __devinit pasemi_nand_probe(struct of_device *ofdev,
                                      const struct of_device_id *match)
 {
        struct pci_dev *pdev;
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
        struct resource res;
        struct nand_chip *chip;
        int err = 0;
@@ -221,8 +221,11 @@ MODULE_DEVICE_TABLE(of, pasemi_nand_match);
 static struct of_platform_driver pasemi_nand_driver =
 {
-        .name           = (char*)driver_name,
+        .driver = {
-        .match_table    = pasemi_nand_match,
+                .name = (char*)driver_name,
+                .owner = THIS_MODULE,
+                .of_match_table = pasemi_nand_match,
+        },
        .probe          = pasemi_nand_probe,
        .remove         = pasemi_nand_remove,
 };
diff --git a/drivers/mtd/nand/socrates_nand.c b/drivers/mtd/nand/socrates_nand.c
index b37cbde6e7d..884852dc7eb 100644
--- a/drivers/mtd/nand/socrates_nand.c
+++ b/drivers/mtd/nand/socrates_nand.c
@@ -301,8 +301,11 @@ static const struct of_device_id socrates_nand_match[] =
 MODULE_DEVICE_TABLE(of, socrates_nand_match);
 static struct of_platform_driver socrates_nand_driver = {
-        .name           = "socrates_nand",
+        .driver = {
-        .match_table    = socrates_nand_match,
+                .name = "socrates_nand",
+                .owner = THIS_MODULE,
+                .of_match_table = socrates_nand_match,
+        },
        .probe          = socrates_nand_probe,
        .remove         = __devexit_p(socrates_nand_remove),
 };
diff --git a/drivers/net/can/mscan/mpc5xxx_can.c b/drivers/net/can/mscan/mpc5xxx_can.c
index 225fd147774..8af8442c694 100644
--- a/drivers/net/can/mscan/mpc5xxx_can.c
+++ b/drivers/net/can/mscan/mpc5xxx_can.c
@@ -392,15 +392,17 @@ static struct of_device_id __devinitdata mpc5xxx_can_table[] = {
 };
 static struct of_platform_driver mpc5xxx_can_driver = {
-        .owner = THIS_MODULE,
+        .driver = {
-        .name = "mpc5xxx_can",
+                .name = "mpc5xxx_can",
+                .owner = THIS_MODULE,
+                .of_match_table = mpc5xxx_can_table,
+        },
        .probe = mpc5xxx_can_probe,
        .remove = __devexit_p(mpc5xxx_can_remove),
 #ifdef CONFIG_PM
        .suspend = mpc5xxx_can_suspend,
        .resume = mpc5xxx_can_resume,
 #endif
-        .match_table = mpc5xxx_can_table,
 };
 static int __init mpc5xxx_can_init(void)
diff --git a/drivers/net/can/sja1000/sja1000_of_platform.c b/drivers/net/can/sja1000/sja1000_of_platform.c
index 34e79efbd2f..ac1a83d7c20 100644
--- a/drivers/net/can/sja1000/sja1000_of_platform.c
+++ b/drivers/net/can/sja1000/sja1000_of_platform.c
@@ -71,7 +71,7 @@ static int __devexit sja1000_ofp_remove(struct of_device *ofdev)
 {
        struct net_device *dev = dev_get_drvdata(&ofdev->dev);
        struct sja1000_priv *priv = netdev_priv(dev);
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
        struct resource res;
        dev_set_drvdata(&ofdev->dev, NULL);
@@ -90,7 +90,7 @@ static int __devexit sja1000_ofp_remove(struct of_device *ofdev)
 static int __devinit sja1000_ofp_probe(struct of_device *ofdev,
                                       const struct of_device_id *id)
 {
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
        struct net_device *dev;
        struct sja1000_priv *priv;
        struct resource res;
@@ -215,11 +215,13 @@ static struct of_device_id __devinitdata sja1000_ofp_table[] = {
 MODULE_DEVICE_TABLE(of, sja1000_ofp_table);
 static struct of_platform_driver sja1000_ofp_driver = {
-        .owner = THIS_MODULE,
+        .driver = {
-        .name = DRV_NAME,
+                .owner = THIS_MODULE,
+                .name = DRV_NAME,
+                .of_match_table = sja1000_ofp_table,
+        },
        .probe = sja1000_ofp_probe,
        .remove = __devexit_p(sja1000_ofp_remove),
-        .match_table = sja1000_ofp_table,
 };
 static int __init sja1000_ofp_init(void)
diff --git a/drivers/net/ehea/ehea_main.c b/drivers/net/ehea/ehea_main.c
index 02698a1c80b..f547894ff48 100644
--- a/drivers/net/ehea/ehea_main.c
+++ b/drivers/net/ehea/ehea_main.c
@@ -122,8 +122,11 @@ static struct of_device_id ehea_device_table[] = {
 MODULE_DEVICE_TABLE(of, ehea_device_table);
 static struct of_platform_driver ehea_driver = {
-        .name = "ehea",
+        .driver = {
-        .match_table = ehea_device_table,
+                .name = "ehea",
+                .owner = THIS_MODULE,
+                .of_match_table = ehea_device_table,
+        },
        .probe = ehea_probe_adapter,
        .remove = ehea_remove,
 };
@@ -3050,7 +3053,7 @@ static DEVICE_ATTR(log_port_id, S_IRUSR | S_IRGRP | S_IROTH, ehea_show_port_id,
 static void __devinit logical_port_release(struct device *dev)
 {
        struct ehea_port *port = container_of(dev, struct ehea_port, ofdev.dev);
-        of_node_put(port->ofdev.node);
+        of_node_put(port->ofdev.dev.of_node);
 }
 static struct device *ehea_register_port(struct ehea_port *port,
@@ -3058,7 +3061,7 @@ static struct device *ehea_register_port(struct ehea_port *port,
 {
        int ret;
-        port->ofdev.node = of_node_get(dn);
+        port->ofdev.dev.of_node = of_node_get(dn);
        port->ofdev.dev.parent = &port->adapter->ofdev->dev;
        port->ofdev.dev.bus = &ibmebus_bus_type;
@@ -3225,7 +3228,7 @@ static int ehea_setup_ports(struct ehea_adapter *adapter)
        const u32 *dn_log_port_id;
        int i = 0;
-        lhea_dn = adapter->ofdev->node;
+        lhea_dn = adapter->ofdev->dev.of_node;
        while ((eth_dn = of_get_next_child(lhea_dn, eth_dn))) {
                dn_log_port_id = of_get_property(eth_dn, "ibm,hea-port-no",
@@ -3264,7 +3267,7 @@ static struct device_node *ehea_get_eth_dn(struct ehea_adapter *adapter,
        struct device_node *eth_dn = NULL;
        const u32 *dn_log_port_id;
-        lhea_dn = adapter->ofdev->node;
+        lhea_dn = adapter->ofdev->dev.of_node;
        while ((eth_dn = of_get_next_child(lhea_dn, eth_dn))) {
                dn_log_port_id = of_get_property(eth_dn, "ibm,hea-port-no",
@@ -3394,7 +3397,7 @@ static int __devinit ehea_probe_adapter(struct of_device *dev,
        const u64 *adapter_handle;
        int ret;
-        if (!dev || !dev->node) {
+        if (!dev || !dev->dev.of_node) {
                ehea_error("Invalid ibmebus device probed");
                return -EINVAL;
        }
@@ -3410,14 +3413,14 @@ static int __devinit ehea_probe_adapter(struct of_device *dev,
        adapter->ofdev = dev;
-        adapter_handle = of_get_property(dev->node, "ibm,hea-handle",
+        adapter_handle = of_get_property(dev->dev.of_node, "ibm,hea-handle",
                                         NULL);
        if (adapter_handle)
                adapter->handle = *adapter_handle;
        if (!adapter->handle) {
                dev_err(&dev->dev, "failed getting handle for adapter"
-                        " '%s'\n", dev->node->full_name);
+                        " '%s'\n", dev->dev.of_node->full_name);
                ret = -ENODEV;
                goto out_free_ad;
        }
diff --git a/drivers/net/fec_mpc52xx.c b/drivers/net/fec_mpc52xx.c
index 221f440c10f..25e6cc6840b 100644
--- a/drivers/net/fec_mpc52xx.c
+++ b/drivers/net/fec_mpc52xx.c
@@ -871,7 +871,7 @@ mpc52xx_fec_probe(struct of_device *op, const struct of_device_id *match)
        priv->ndev = ndev;
        /* Reserve FEC control zone */
-        rv = of_address_to_resource(op->node, 0, &mem);
+        rv = of_address_to_resource(op->dev.of_node, 0, &mem);
        if (rv) {
                printk(KERN_ERR DRIVER_NAME ": "
                                "Error while parsing device node resource\n" );
@@ -919,7 +919,7 @@ mpc52xx_fec_probe(struct of_device *op, const struct of_device_id *match)
        /* Get the IRQ we need one by one */
                /* Control */
-        ndev->irq = irq_of_parse_and_map(op->node, 0);
+        ndev->irq = irq_of_parse_and_map(op->dev.of_node, 0);
                /* RX */
        priv->r_irq = bcom_get_task_irq(priv->rx_dmatsk);
@@ -942,20 +942,20 @@ mpc52xx_fec_probe(struct of_device *op, const struct of_device_id *match)
        /* Start with safe defaults for link connection */
        priv->speed = 100;
        priv->duplex = DUPLEX_HALF;
-        priv->mdio_speed = ((mpc5xxx_get_bus_frequency(op->node) >> 20) / 5) << 1;
+        priv->mdio_speed = ((mpc5xxx_get_bus_frequency(op->dev.of_node) >> 20) / 5) << 1;
        /* The current speed preconfigures the speed of the MII link */
-        prop = of_get_property(op->node, "current-speed", &prop_size);
+        prop = of_get_property(op->dev.of_node, "current-speed", &prop_size);
        if (prop && (prop_size >= sizeof(u32) * 2)) {
                priv->speed = prop[0];
                priv->duplex = prop[1] ? DUPLEX_FULL : DUPLEX_HALF;
        }
        /* If there is a phy handle, then get the PHY node */
-        priv->phy_node = of_parse_phandle(op->node, "phy-handle", 0);
+        priv->phy_node = of_parse_phandle(op->dev.of_node, "phy-handle", 0);
        /* the 7-wire property means don't use MII mode */
-        if (of_find_property(op->node, "fsl,7-wire-mode", NULL)) {
+        if (of_find_property(op->dev.of_node, "fsl,7-wire-mode", NULL)) {
                priv->seven_wire_mode = 1;
                dev_info(&ndev->dev, "using 7-wire PHY mode\n");
        }
@@ -1063,9 +1063,11 @@ static struct of_device_id mpc52xx_fec_match[] = {
 MODULE_DEVICE_TABLE(of, mpc52xx_fec_match);
 static struct of_platform_driver mpc52xx_fec_driver = {
-        .owner          = THIS_MODULE,
+        .driver = {
-        .name           = DRIVER_NAME,
+                .name = DRIVER_NAME,
-        .match_table    = mpc52xx_fec_match,
+                .owner = THIS_MODULE,
+                .of_match_table = mpc52xx_fec_match,
+        },
        .probe          = mpc52xx_fec_probe,
        .remove         = mpc52xx_fec_remove,
 #ifdef CONFIG_PM
diff --git a/drivers/net/fec_mpc52xx_phy.c b/drivers/net/fec_mpc52xx_phy.c
index 7658a082e39..006f64d9f96 100644
--- a/drivers/net/fec_mpc52xx_phy.c
+++ b/drivers/net/fec_mpc52xx_phy.c
@@ -66,7 +66,7 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of,
                const struct of_device_id *match)
 {
        struct device *dev = &of->dev;
-        struct device_node *np = of->node;
+        struct device_node *np = of->dev.of_node;
        struct mii_bus *bus;
        struct mpc52xx_fec_mdio_priv *priv;
        struct resource res = {};
@@ -107,7 +107,7 @@ static int mpc52xx_fec_mdio_probe(struct of_device *of,
        /* set MII speed */
        out_be32(&priv->regs->mii_speed,
-                ((mpc5xxx_get_bus_frequency(of->node) >> 20) / 5) << 1);
+                ((mpc5xxx_get_bus_frequency(of->dev.of_node) >> 20) / 5) << 1);
        err = of_mdiobus_register(bus, np);
        if (err)
@@ -159,10 +159,13 @@ static struct of_device_id mpc52xx_fec_mdio_match[] = {
 MODULE_DEVICE_TABLE(of, mpc52xx_fec_mdio_match);
 struct of_platform_driver mpc52xx_fec_mdio_driver = {
-        .name = "mpc5200b-fec-phy",
+        .driver = {
+                .name = "mpc5200b-fec-phy",
+                .owner = THIS_MODULE,
+                .of_match_table = mpc52xx_fec_mdio_match,
+        },
        .probe = mpc52xx_fec_mdio_probe,
        .remove = mpc52xx_fec_mdio_remove,
-        .match_table = mpc52xx_fec_mdio_match,
 };
 /* let fec driver call it, since this has to be registered before it */
diff --git a/drivers/net/fs_enet/fs_enet-main.c b/drivers/net/fs_enet/fs_enet-main.c
index 0fb0fefcb78..309a0eaddd8 100644
--- a/drivers/net/fs_enet/fs_enet-main.c
+++ b/drivers/net/fs_enet/fs_enet-main.c
@@ -1013,7 +1013,7 @@ static int __devinit fs_enet_probe(struct of_device *ofdev,
                return -ENOMEM;
        if (!IS_FEC(match)) {
-                data = of_get_property(ofdev->node, "fsl,cpm-command", &len);
+                data = of_get_property(ofdev->dev.of_node, "fsl,cpm-command", &len);
                if (!data || len != 4)
                        goto out_free_fpi;
@@ -1025,8 +1025,8 @@ static int __devinit fs_enet_probe(struct of_device *ofdev,
        fpi->rx_copybreak = 240;
        fpi->use_napi = 1;
        fpi->napi_weight = 17;
-        fpi->phy_node = of_parse_phandle(ofdev->node, "phy-handle", 0);
+        fpi->phy_node = of_parse_phandle(ofdev->dev.of_node, "phy-handle", 0);
-        if ((!fpi->phy_node) && (!of_get_property(ofdev->node, "fixed-link",
+        if ((!fpi->phy_node) && (!of_get_property(ofdev->dev.of_node, "fixed-link",
                                                  NULL)))
                goto out_free_fpi;
@@ -1059,7 +1059,7 @@ static int __devinit fs_enet_probe(struct of_device *ofdev,
        spin_lock_init(&fep->lock);
        spin_lock_init(&fep->tx_lock);
-        mac_addr = of_get_mac_address(ofdev->node);
+        mac_addr = of_get_mac_address(ofdev->dev.of_node);
        if (mac_addr)
                memcpy(ndev->dev_addr, mac_addr, 6);
@@ -1156,8 +1156,11 @@ static struct of_device_id fs_enet_match[] = {
 MODULE_DEVICE_TABLE(of, fs_enet_match);
 static struct of_platform_driver fs_enet_driver = {
-        .name   = "fs_enet",
+        .driver = {
-        .match_table = fs_enet_match,
+                .owner = THIS_MODULE,
+                .name = "fs_enet",
+                .of_match_table = fs_enet_match,
+        },
        .probe = fs_enet_probe,
        .remove = fs_enet_remove,
 };
diff --git a/drivers/net/fs_enet/mac-fcc.c b/drivers/net/fs_enet/mac-fcc.c
index 714da967fa1..5d45084b287 100644
--- a/drivers/net/fs_enet/mac-fcc.c
+++ b/drivers/net/fs_enet/mac-fcc.c
@@ -88,19 +88,19 @@ static int do_pd_setup(struct fs_enet_private *fep)
        struct fs_platform_info *fpi = fep->fpi;
        int ret = -EINVAL;
-        fep->interrupt = of_irq_to_resource(ofdev->node, 0, NULL);
+        fep->interrupt = of_irq_to_resource(ofdev->dev.of_node, 0, NULL);
        if (fep->interrupt == NO_IRQ)
                goto out;
-        fep->fcc.fccp = of_iomap(ofdev->node, 0);
+        fep->fcc.fccp = of_iomap(ofdev->dev.of_node, 0);
        if (!fep->fcc.fccp)
                goto out;
-        fep->fcc.ep = of_iomap(ofdev->node, 1);
+        fep->fcc.ep = of_iomap(ofdev->dev.of_node, 1);
        if (!fep->fcc.ep)
                goto out_fccp;
-        fep->fcc.fcccp = of_iomap(ofdev->node, 2);
+        fep->fcc.fcccp = of_iomap(ofdev->dev.of_node, 2);
        if (!fep->fcc.fcccp)
                goto out_ep;
diff --git a/drivers/net/fs_enet/mac-fec.c b/drivers/net/fs_enet/mac-fec.c
index 7eff92ef01d..7ca1642276d 100644
--- a/drivers/net/fs_enet/mac-fec.c
+++ b/drivers/net/fs_enet/mac-fec.c
@@ -98,11 +98,11 @@ static int do_pd_setup(struct fs_enet_private *fep)
 {
        struct of_device *ofdev = to_of_device(fep->dev);
-        fep->interrupt = of_irq_to_resource(ofdev->node, 0, NULL);
+        fep->interrupt = of_irq_to_resource(ofdev->dev.of_node, 0, NULL);
        if (fep->interrupt == NO_IRQ)
                return -EINVAL;
-        fep->fec.fecp = of_iomap(ofdev->node, 0);
+        fep->fec.fecp = of_iomap(ofdev->dev.of_node, 0);
        if (!fep->fcc.fccp)
                return -EINVAL;
diff --git a/drivers/net/fs_enet/mac-scc.c b/drivers/net/fs_enet/mac-scc.c
index 7f0591e43cd..a3c44544846 100644
--- a/drivers/net/fs_enet/mac-scc.c
+++ b/drivers/net/fs_enet/mac-scc.c
@@ -98,15 +98,15 @@ static int do_pd_setup(struct fs_enet_private *fep)
 {
        struct of_device *ofdev = to_of_device(fep->dev);
-        fep->interrupt = of_irq_to_resource(ofdev->node, 0, NULL);
+        fep->interrupt = of_irq_to_resource(ofdev->dev.of_node, 0, NULL);
        if (fep->interrupt == NO_IRQ)
                return -EINVAL;
-        fep->scc.sccp = of_iomap(ofdev->node, 0);
+        fep->scc.sccp = of_iomap(ofdev->dev.of_node, 0);
        if (!fep->scc.sccp)
                return -EINVAL;
-        fep->scc.ep = of_iomap(ofdev->node, 1);
+        fep->scc.ep = of_iomap(ofdev->dev.of_node, 1);
        if (!fep->scc.ep) {
                iounmap(fep->scc.sccp);
                return -EINVAL;
diff --git a/drivers/net/fs_enet/mii-bitbang.c b/drivers/net/fs_enet/mii-bitbang.c
index 24ff9f43a62..0f90685d3d1 100644
--- a/drivers/net/fs_enet/mii-bitbang.c
+++ b/drivers/net/fs_enet/mii-bitbang.c
@@ -224,8 +224,11 @@ static struct of_device_id fs_enet_mdio_bb_match[] = {
 MODULE_DEVICE_TABLE(of, fs_enet_mdio_bb_match);
 static struct of_platform_driver fs_enet_bb_mdio_driver = {
-        .name = "fsl-bb-mdio",
+        .driver = {
-        .match_table = fs_enet_mdio_bb_match,
+                .name = "fsl-bb-mdio",
+                .owner = THIS_MODULE,
+                .of_match_table = fs_enet_mdio_bb_match,
+        },
        .probe = fs_enet_mdio_probe,
        .remove = fs_enet_mdio_remove,
 };
diff --git a/drivers/net/fs_enet/mii-fec.c b/drivers/net/fs_enet/mii-fec.c
index 5944b65082c..bddffd169b9 100644
--- a/drivers/net/fs_enet/mii-fec.c
+++ b/drivers/net/fs_enet/mii-fec.c
@@ -124,7 +124,7 @@ static int __devinit fs_enet_mdio_probe(struct of_device *ofdev,
        new_bus->write = &fs_enet_fec_mii_write;
        new_bus->reset = &fs_enet_fec_mii_reset;
-        ret = of_address_to_resource(ofdev->node, 0, &res);
+        ret = of_address_to_resource(ofdev->dev.of_node, 0, &res);
        if (ret)
                goto out_res;
@@ -135,7 +135,7 @@ static int __devinit fs_enet_mdio_probe(struct of_device *ofdev,
                goto out_fec;
        if (get_bus_freq) {
-                clock = get_bus_freq(ofdev->node);
+                clock = get_bus_freq(ofdev->dev.of_node);
                if (!clock) {
                        /* Use maximum divider if clock is unknown */
                        dev_warn(&ofdev->dev, "could not determine IPS clock\n");
@@ -172,7 +172,7 @@ static int __devinit fs_enet_mdio_probe(struct of_device *ofdev,
        new_bus->parent = &ofdev->dev;
        dev_set_drvdata(&ofdev->dev, new_bus);
-        ret = of_mdiobus_register(new_bus, ofdev->node);
+        ret = of_mdiobus_register(new_bus, ofdev->dev.of_node);
        if (ret)
                goto out_free_irqs;
@@ -222,8 +222,11 @@ static struct of_device_id fs_enet_mdio_fec_match[] = {
 MODULE_DEVICE_TABLE(of, fs_enet_mdio_fec_match);
 static struct of_platform_driver fs_enet_fec_mdio_driver = {
-        .name = "fsl-fec-mdio",
+        .driver = {
-        .match_table = fs_enet_mdio_fec_match,
+                .name = "fsl-fec-mdio",
+                .owner = THIS_MODULE,
+                .of_match_table = fs_enet_mdio_fec_match,
+        },
        .probe = fs_enet_mdio_probe,
        .remove = fs_enet_mdio_remove,
 };
diff --git a/drivers/net/fsl_pq_mdio.c b/drivers/net/fsl_pq_mdio.c
index ff028f59b93..b4c41d72c42 100644
--- a/drivers/net/fsl_pq_mdio.c
+++ b/drivers/net/fsl_pq_mdio.c
@@ -267,7 +267,7 @@ static int get_ucc_id_for_range(u64 start, u64 end, u32 *ucc_id)
 static int fsl_pq_mdio_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 *tbi;
        struct fsl_pq_mdio_priv *priv;
        struct fsl_pq_mdio __iomem *regs = NULL;
@@ -471,10 +471,13 @@ static struct of_device_id fsl_pq_mdio_match[] = {
 MODULE_DEVICE_TABLE(of, fsl_pq_mdio_match);
 static struct of_platform_driver fsl_pq_mdio_driver = {
-        .name = "fsl-pq_mdio",
+        .driver = {
+                .name = "fsl-pq_mdio",
+                .owner = THIS_MODULE,
+                .of_match_table = fsl_pq_mdio_match,
+        },
        .probe = fsl_pq_mdio_probe,
        .remove = fsl_pq_mdio_remove,
-        .match_table = fsl_pq_mdio_match,
 };
 int __init fsl_pq_mdio_init(void)
diff --git a/drivers/net/gianfar.c b/drivers/net/gianfar.c
index c6791cd4ee0..1830f3199cb 100644
--- a/drivers/net/gianfar.c
+++ b/drivers/net/gianfar.c
@@ -608,7 +608,7 @@ static int gfar_of_init(struct of_device *ofdev, struct net_device **pdev)
        int err = 0, i;
        struct net_device *dev = NULL;
        struct gfar_private *priv = NULL;
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
        struct device_node *child = NULL;
        const u32 *stash;
        const u32 *stash_len;
@@ -646,7 +646,7 @@ static int gfar_of_init(struct of_device *ofdev, struct net_device **pdev)
                return -ENOMEM;
        priv = netdev_priv(dev);
-        priv->node = ofdev->node;
+        priv->node = ofdev->dev.of_node;
        priv->ndev = dev;
        dev->num_tx_queues = num_tx_qs;
@@ -939,7 +939,7 @@ static int gfar_probe(struct of_device *ofdev,
        priv = netdev_priv(dev);
        priv->ndev = dev;
        priv->ofdev = ofdev;
-        priv->node = ofdev->node;
+        priv->node = ofdev->dev.of_node;
        SET_NETDEV_DEV(dev, &ofdev->dev);
        spin_lock_init(&priv->bflock);
@@ -3167,12 +3167,14 @@ MODULE_DEVICE_TABLE(of, gfar_match);
 /* Structure for a device driver */
 static struct of_platform_driver gfar_driver = {
-        .name = "fsl-gianfar",
+        .driver = {
-        .match_table = gfar_match,
+                .name = "fsl-gianfar",
+                .owner = THIS_MODULE,
+                .pm = GFAR_PM_OPS,
+                .of_match_table = gfar_match,
+        },
        .probe = gfar_probe,
        .remove = gfar_remove,
-        .driver.pm = GFAR_PM_OPS,
 };
 static int __init gfar_init(void)
diff --git a/drivers/net/greth.c b/drivers/net/greth.c
index fd491e40948..f37a4c143dd 100644
--- a/drivers/net/greth.c
+++ b/drivers/net/greth.c
@@ -1499,7 +1499,8 @@ static int __devinit greth_of_probe(struct of_device *ofdev, const struct of_dev
        if (i == 6) {
                const unsigned char *addr;
                int len;
-                addr = of_get_property(ofdev->node, "local-mac-address", &len);
+                addr = of_get_property(ofdev->dev.of_node, "local-mac-address",
+                                        &len);
                if (addr != NULL && len == 6) {
                        for (i = 0; i < 6; i++)
                                macaddr[i] = (unsigned int) addr[i];
diff --git a/drivers/net/ibm_newemac/core.c b/drivers/net/ibm_newemac/core.c
index 2484e9e6c1e..b150c102ca5 100644
--- a/drivers/net/ibm_newemac/core.c
+++ b/drivers/net/ibm_newemac/core.c
@@ -136,7 +136,8 @@ static inline void emac_report_timeout_error(struct emac_instance *dev,
                                  EMAC_FTR_440EP_PHY_CLK_FIX))
                DBG(dev, "%s" NL, error);
        else if (net_ratelimit())
-                printk(KERN_ERR "%s: %s\n", dev->ofdev->node->full_name, error);
+                printk(KERN_ERR "%s: %s\n", dev->ofdev->dev.of_node->full_name,
+                        error);
 }
 /* EMAC PHY clock workaround:
@@ -2185,7 +2186,7 @@ static void emac_ethtool_get_drvinfo(struct net_device *ndev,
        strcpy(info->version, DRV_VERSION);
        info->fw_version[0] = '\0';
        sprintf(info->bus_info, "PPC 4xx EMAC-%d %s",
-                dev->cell_index, dev->ofdev->node->full_name);
+                dev->cell_index, dev->ofdev->dev.of_node->full_name);
        info->regdump_len = emac_ethtool_get_regs_len(ndev);
 }
@@ -2379,7 +2380,7 @@ static int __devinit emac_read_uint_prop(struct device_node *np, const char *nam
 static int __devinit emac_init_phy(struct emac_instance *dev)
 {
-        struct device_node *np = dev->ofdev->node;
+        struct device_node *np = dev->ofdev->dev.of_node;
        struct net_device *ndev = dev->ndev;
        u32 phy_map, adv;
        int i;
@@ -2514,7 +2515,7 @@ static int __devinit emac_init_phy(struct emac_instance *dev)
 static int __devinit emac_init_config(struct emac_instance *dev)
 {
-        struct device_node *np = dev->ofdev->node;
+        struct device_node *np = dev->ofdev->dev.of_node;
        const void *p;
        unsigned int plen;
        const char *pm, *phy_modes[] = {
@@ -2723,7 +2724,7 @@ static int __devinit emac_probe(struct of_device *ofdev,
 {
        struct net_device *ndev;
        struct emac_instance *dev;
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
        struct device_node **blist = NULL;
        int err, i;
@@ -2810,7 +2811,7 @@ static int __devinit emac_probe(struct of_device *ofdev,
        err = mal_register_commac(dev->mal, &dev->commac);
        if (err) {
                printk(KERN_ERR "%s: failed to register with mal %s!\n",
-                       np->full_name, dev->mal_dev->node->full_name);
+                       np->full_name, dev->mal_dev->dev.of_node->full_name);
                goto err_rel_deps;
        }
        dev->rx_skb_size = emac_rx_skb_size(ndev->mtu);
@@ -2995,9 +2996,11 @@ static struct of_device_id emac_match[] =
 MODULE_DEVICE_TABLE(of, emac_match);
 static struct of_platform_driver emac_driver = {
-        .name = "emac",
+        .driver = {
-        .match_table = emac_match,
+                .name = "emac",
+                .owner = THIS_MODULE,
+                .of_match_table = emac_match,
+        },
        .probe = emac_probe,
        .remove = emac_remove,
 };
diff --git a/drivers/net/ibm_newemac/debug.c b/drivers/net/ibm_newemac/debug.c
index 775c850a425..3995fafc1e0 100644
--- a/drivers/net/ibm_newemac/debug.c
+++ b/drivers/net/ibm_newemac/debug.c
@@ -33,7 +33,7 @@ static void emac_desc_dump(struct emac_instance *p)
        int i;
        printk("** EMAC %s TX BDs **\n"
               " tx_cnt = %d tx_slot = %d ack_slot = %d\n",
-               p->ofdev->node->full_name,
+               p->ofdev->dev.of_node->full_name,
               p->tx_cnt, p->tx_slot, p->ack_slot);
        for (i = 0; i < NUM_TX_BUFF / 2; ++i)
                printk
@@ -49,7 +49,7 @@ static void emac_desc_dump(struct emac_instance *p)
        printk("** EMAC %s RX BDs **\n"
               " rx_slot = %d flags = 0x%lx rx_skb_size = %d rx_sync_size = %d\n"
               " rx_sg_skb = 0x%p\n",
-               p->ofdev->node->full_name,
+               p->ofdev->dev.of_node->full_name,
               p->rx_slot, p->commac.flags, p->rx_skb_size,
               p->rx_sync_size, p->rx_sg_skb);
        for (i = 0; i < NUM_RX_BUFF / 2; ++i)
@@ -77,7 +77,8 @@ static void emac_mac_dump(struct emac_instance *dev)
               "MR0 = 0x%08x MR1 = 0x%08x TMR0 = 0x%08x TMR1 = 0x%08x\n"
               "RMR = 0x%08x ISR = 0x%08x ISER = 0x%08x\n"
               "IAR = %04x%08x VTPID = 0x%04x VTCI = 0x%04x\n",
-               dev->ofdev->node->full_name, in_be32(&p->mr0), in_be32(&p->mr1),
+               dev->ofdev->dev.of_node->full_name,
+               in_be32(&p->mr0), in_be32(&p->mr1),
               in_be32(&p->tmr0), in_be32(&p->tmr1),
               in_be32(&p->rmr), in_be32(&p->isr), in_be32(&p->iser),
               in_be32(&p->iahr), in_be32(&p->ialr), in_be32(&p->vtpid),
@@ -128,7 +129,7 @@ static void emac_mal_dump(struct mal_instance *mal)
               "CFG = 0x%08x ESR = 0x%08x IER = 0x%08x\n"
               "TX|CASR = 0x%08x CARR = 0x%08x EOBISR = 0x%08x DEIR = 0x%08x\n"
               "RX|CASR = 0x%08x CARR = 0x%08x EOBISR = 0x%08x DEIR = 0x%08x\n",
-               mal->ofdev->node->full_name,
+               mal->ofdev->dev.of_node->full_name,
               get_mal_dcrn(mal, MAL_CFG), get_mal_dcrn(mal, MAL_ESR),
               get_mal_dcrn(mal, MAL_IER),
               get_mal_dcrn(mal, MAL_TXCASR), get_mal_dcrn(mal, MAL_TXCARR),
diff --git a/drivers/net/ibm_newemac/debug.h b/drivers/net/ibm_newemac/debug.h
index b631842ec8d..e596c77ccdf 100644
--- a/drivers/net/ibm_newemac/debug.h
+++ b/drivers/net/ibm_newemac/debug.h
@@ -53,8 +53,8 @@ extern void emac_dbg_dump_all(void);
 #endif
-#define EMAC_DBG(dev, name, fmt, arg...) \
+#define EMAC_DBG(d, name, fmt, arg...) \
-        printk(KERN_DEBUG #name "%s: " fmt, dev->ofdev->node->full_name, ## arg)
+        printk(KERN_DEBUG #name "%s: " fmt, d->ofdev->dev.of_node->full_name, ## arg)
 #if DBG_LEVEL > 0
 #  define DBG(d,f,x...)         EMAC_DBG(d, emac, f, ##x)
diff --git a/drivers/net/ibm_newemac/mal.c b/drivers/net/ibm_newemac/mal.c
index 5b3d94419fe..fcff9e0bd38 100644
--- a/drivers/net/ibm_newemac/mal.c
+++ b/drivers/net/ibm_newemac/mal.c
@@ -538,11 +538,11 @@ static int __devinit mal_probe(struct of_device *ofdev,
        }
        mal->index = index;
        mal->ofdev = ofdev;
-        mal->version = of_device_is_compatible(ofdev->node, "ibm,mcmal2") ? 2 : 1;
+        mal->version = of_device_is_compatible(ofdev->dev.of_node, "ibm,mcmal2") ? 2 : 1;
        MAL_DBG(mal, "probe" NL);
-        prop = of_get_property(ofdev->node, "num-tx-chans", NULL);
+        prop = of_get_property(ofdev->dev.of_node, "num-tx-chans", NULL);
        if (prop == NULL) {
                printk(KERN_ERR
                       "mal%d: can't find MAL num-tx-chans property!\n",
@@ -552,7 +552,7 @@ static int __devinit mal_probe(struct of_device *ofdev,
        }
        mal->num_tx_chans = prop[0];
-        prop = of_get_property(ofdev->node, "num-rx-chans", NULL);
+        prop = of_get_property(ofdev->dev.of_node, "num-rx-chans", NULL);
        if (prop == NULL) {
                printk(KERN_ERR
                       "mal%d: can't find MAL num-rx-chans property!\n",
@@ -562,14 +562,14 @@ static int __devinit mal_probe(struct of_device *ofdev,
        }
        mal->num_rx_chans = prop[0];
-        dcr_base = dcr_resource_start(ofdev->node, 0);
+        dcr_base = dcr_resource_start(ofdev->dev.of_node, 0);
        if (dcr_base == 0) {
                printk(KERN_ERR
                       "mal%d: can't find DCR resource!\n", index);
                err = -ENODEV;
                goto fail;
        }
-        mal->dcr_host = dcr_map(ofdev->node, dcr_base, 0x100);
+        mal->dcr_host = dcr_map(ofdev->dev.of_node, dcr_base, 0x100);
        if (!DCR_MAP_OK(mal->dcr_host)) {
                printk(KERN_ERR
                       "mal%d: failed to map DCRs !\n", index);
@@ -577,28 +577,28 @@ static int __devinit mal_probe(struct of_device *ofdev,
                goto fail;
        }
-        if (of_device_is_compatible(ofdev->node, "ibm,mcmal-405ez")) {
+        if (of_device_is_compatible(ofdev->dev.of_node, "ibm,mcmal-405ez")) {
 #if defined(CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT) && \
                defined(CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR)
                mal->features |= (MAL_FTR_CLEAR_ICINTSTAT |
                                MAL_FTR_COMMON_ERR_INT);
 #else
                printk(KERN_ERR "%s: Support for 405EZ not enabled!\n",
-                                ofdev->node->full_name);
+                                ofdev->dev.of_node->full_name);
                err = -ENODEV;
                goto fail;
 #endif
        }
-        mal->txeob_irq = irq_of_parse_and_map(ofdev->node, 0);
+        mal->txeob_irq = irq_of_parse_and_map(ofdev->dev.of_node, 0);
-        mal->rxeob_irq = irq_of_parse_and_map(ofdev->node, 1);
+        mal->rxeob_irq = irq_of_parse_and_map(ofdev->dev.of_node, 1);
-        mal->serr_irq = irq_of_parse_and_map(ofdev->node, 2);
+        mal->serr_irq = irq_of_parse_and_map(ofdev->dev.of_node, 2);
        if (mal_has_feature(mal, MAL_FTR_COMMON_ERR_INT)) {
                mal->txde_irq = mal->rxde_irq = mal->serr_irq;
        } else {
-                mal->txde_irq = irq_of_parse_and_map(ofdev->node, 3);
+                mal->txde_irq = irq_of_parse_and_map(ofdev->dev.of_node, 3);
-                mal->rxde_irq = irq_of_parse_and_map(ofdev->node, 4);
+                mal->rxde_irq = irq_of_parse_and_map(ofdev->dev.of_node, 4);
        }
        if (mal->txeob_irq == NO_IRQ || mal->rxeob_irq == NO_IRQ ||
@@ -629,7 +629,7 @@ static int __devinit mal_probe(struct of_device *ofdev,
        /* Current Axon is not happy with priority being non-0, it can
         * deadlock, fix it up here
         */
-        if (of_device_is_compatible(ofdev->node, "ibm,mcmal-axon"))
+        if (of_device_is_compatible(ofdev->dev.of_node, "ibm,mcmal-axon"))
                cfg &= ~(MAL2_CFG_RPP_10 | MAL2_CFG_WPP_10);
        /* Apply configuration */
@@ -701,7 +701,7 @@ static int __devinit mal_probe(struct of_device *ofdev,
        printk(KERN_INFO
               "MAL v%d %s, %d TX channels, %d RX channels\n",
-               mal->version, ofdev->node->full_name,
+               mal->version, ofdev->dev.of_node->full_name,
               mal->num_tx_chans, mal->num_rx_chans);
        /* Advertise this instance to the rest of the world */
@@ -790,9 +790,11 @@ static struct of_device_id mal_platform_match[] =
 };
 static struct of_platform_driver mal_of_driver = {
-        .name = "mcmal",
+        .driver = {
-        .match_table = mal_platform_match,
+                .name = "mcmal",
+                .owner = THIS_MODULE,
+                .of_match_table = mal_platform_match,
+        },
        .probe = mal_probe,
        .remove = mal_remove,
 };
diff --git a/drivers/net/ibm_newemac/rgmii.c b/drivers/net/ibm_newemac/rgmii.c
index 5b90d34c845..108919bcdf1 100644
--- a/drivers/net/ibm_newemac/rgmii.c
+++ b/drivers/net/ibm_newemac/rgmii.c
@@ -103,7 +103,7 @@ int __devinit rgmii_attach(struct of_device *ofdev, int input, int mode)
        /* Check if we need to attach to a RGMII */
        if (input < 0 || !rgmii_valid_mode(mode)) {
                printk(KERN_ERR "%s: unsupported settings !\n",
-                       ofdev->node->full_name);
+                       ofdev->dev.of_node->full_name);
                return -ENODEV;
        }
@@ -113,7 +113,7 @@ int __devinit rgmii_attach(struct of_device *ofdev, int input, int mode)
        out_be32(&p->fer, in_be32(&p->fer) | rgmii_mode_mask(mode, input));
        printk(KERN_NOTICE "%s: input %d in %s mode\n",
-               ofdev->node->full_name, input, rgmii_mode_name(mode));
+               ofdev->dev.of_node->full_name, input, rgmii_mode_name(mode));
        ++dev->users;
@@ -231,7 +231,7 @@ void *rgmii_dump_regs(struct of_device *ofdev, void *buf)
 static int __devinit rgmii_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 rgmii_instance *dev;
        struct resource regs;
        int rc;
@@ -264,11 +264,11 @@ static int __devinit rgmii_probe(struct of_device *ofdev,
        }
        /* Check for RGMII flags */
-        if (of_get_property(ofdev->node, "has-mdio", NULL))
+        if (of_get_property(ofdev->dev.of_node, "has-mdio", NULL))
                dev->flags |= EMAC_RGMII_FLAG_HAS_MDIO;
        /* CAB lacks the right properties, fix this up */
-        if (of_device_is_compatible(ofdev->node, "ibm,rgmii-axon"))
+        if (of_device_is_compatible(ofdev->dev.of_node, "ibm,rgmii-axon"))
                dev->flags |= EMAC_RGMII_FLAG_HAS_MDIO;
        DBG2(dev, " Boot FER = 0x%08x, SSR = 0x%08x\n",
@@ -279,7 +279,7 @@ static int __devinit rgmii_probe(struct of_device *ofdev,
        printk(KERN_INFO
               "RGMII %s initialized with%s MDIO support\n",
-               ofdev->node->full_name,
+               ofdev->dev.of_node->full_name,
               (dev->flags & EMAC_RGMII_FLAG_HAS_MDIO) ? "" : "out");
        wmb();
@@ -319,9 +319,11 @@ static struct of_device_id rgmii_match[] =
 };
 static struct of_platform_driver rgmii_driver = {
-        .name = "emac-rgmii",
+        .driver = {
-        .match_table = rgmii_match,
+                .name = "emac-rgmii",
+                .owner = THIS_MODULE,
+                .of_match_table = rgmii_match,
+        },
        .probe = rgmii_probe,
        .remove = rgmii_remove,
 };
diff --git a/drivers/net/ibm_newemac/tah.c b/drivers/net/ibm_newemac/tah.c
index 30173a9fb55..044637144c4 100644
--- a/drivers/net/ibm_newemac/tah.c
+++ b/drivers/net/ibm_newemac/tah.c
@@ -57,7 +57,8 @@ void tah_reset(struct of_device *ofdev)
                --n;
        if (unlikely(!n))
-                printk(KERN_ERR "%s: reset timeout\n", ofdev->node->full_name);
+                printk(KERN_ERR "%s: reset timeout\n",
+                        ofdev->dev.of_node->full_name);
        /* 10KB TAH TX FIFO accomodates the max MTU of 9000 */
        out_be32(&p->mr,
@@ -89,7 +90,7 @@ void *tah_dump_regs(struct of_device *ofdev, void *buf)
 static int __devinit tah_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 tah_instance *dev;
        struct resource regs;
        int rc;
@@ -127,7 +128,7 @@ static int __devinit tah_probe(struct of_device *ofdev,
        tah_reset(ofdev);
        printk(KERN_INFO
-               "TAH %s initialized\n", ofdev->node->full_name);
+               "TAH %s initialized\n", ofdev->dev.of_node->full_name);
        wmb();
        return 0;
@@ -165,9 +166,11 @@ static struct of_device_id tah_match[] =
 };
 static struct of_platform_driver tah_driver = {
-        .name = "emac-tah",
+        .driver = {
-        .match_table = tah_match,
+                .name = "emac-tah",
+                .owner = THIS_MODULE,
+                .of_match_table = tah_match,
+        },
        .probe = tah_probe,
        .remove = tah_remove,
 };
diff --git a/drivers/net/ibm_newemac/zmii.c b/drivers/net/ibm_newemac/zmii.c
index 1f038f808ab..046dcd069c4 100644
--- a/drivers/net/ibm_newemac/zmii.c
+++ b/drivers/net/ibm_newemac/zmii.c
@@ -121,13 +121,14 @@ int __devinit zmii_attach(struct of_device *ofdev, int input, int *mode)
                        dev->mode = *mode;
                printk(KERN_NOTICE "%s: bridge in %s mode\n",
-                       ofdev->node->full_name, zmii_mode_name(dev->mode));
+                       ofdev->dev.of_node->full_name,
+                       zmii_mode_name(dev->mode));
        } else {
                /* All inputs must use the same mode */
                if (*mode != PHY_MODE_NA && *mode != dev->mode) {
                        printk(KERN_ERR
                               "%s: invalid mode %d specified for input %d\n",
-                               ofdev->node->full_name, *mode, input);
+                               ofdev->dev.of_node->full_name, *mode, input);
                        mutex_unlock(&dev->lock);
                        return -EINVAL;
                }
@@ -233,7 +234,7 @@ void *zmii_dump_regs(struct of_device *ofdev, void *buf)
 static int __devinit zmii_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 zmii_instance *dev;
        struct resource regs;
        int rc;
@@ -273,7 +274,7 @@ static int __devinit zmii_probe(struct of_device *ofdev,
        out_be32(&dev->base->fer, 0);
        printk(KERN_INFO
-               "ZMII %s initialized\n", ofdev->node->full_name);
+               "ZMII %s initialized\n", ofdev->dev.of_node->full_name);
        wmb();
        dev_set_drvdata(&ofdev->dev, dev);
@@ -312,9 +313,11 @@ static struct of_device_id zmii_match[] =
 };
 static struct of_platform_driver zmii_driver = {
-        .name = "emac-zmii",
+        .driver = {
-        .match_table = zmii_match,
+                .name = "emac-zmii",
+                .owner = THIS_MODULE,
+                .of_match_table = zmii_match,
+        },
        .probe = zmii_probe,
        .remove = zmii_remove,
 };
diff --git a/drivers/net/ll_temac_main.c b/drivers/net/ll_temac_main.c
index b59b24d667f..fa7620e2840 100644
--- a/drivers/net/ll_temac_main.c
+++ b/drivers/net/ll_temac_main.c
@@ -920,14 +920,14 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match)
        mutex_init(&lp->indirect_mutex);
        /* map device registers */
-        lp->regs = of_iomap(op->node, 0);
+        lp->regs = of_iomap(op->dev.of_node, 0);
        if (!lp->regs) {
                dev_err(&op->dev, "could not map temac regs.\n");
                goto nodev;
        }
        /* Find the DMA node, map the DMA registers, and decode the DMA IRQs */
-        np = of_parse_phandle(op->node, "llink-connected", 0);
+        np = of_parse_phandle(op->dev.of_node, "llink-connected", 0);
        if (!np) {
                dev_err(&op->dev, "could not find DMA node\n");
                goto nodev;
@@ -959,7 +959,7 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match)
        of_node_put(np); /* Finished with the DMA node; drop the reference */
        /* Retrieve the MAC address */
-        addr = of_get_property(op->node, "local-mac-address", &size);
+        addr = of_get_property(op->dev.of_node, "local-mac-address", &size);
        if ((!addr) || (size != 6)) {
                dev_err(&op->dev, "could not find MAC address\n");
                rc = -ENODEV;
@@ -967,11 +967,11 @@ temac_of_probe(struct of_device *op, const struct of_device_id *match)
        }
        temac_set_mac_address(ndev, (void *)addr);
-        rc = temac_mdio_setup(lp, op->node);
+        rc = temac_mdio_setup(lp, op->dev.of_node);
        if (rc)
                dev_warn(&op->dev, "error registering MDIO bus\n");
-        lp->phy_node = of_parse_phandle(op->node, "phy-handle", 0);
+        lp->phy_node = of_parse_phandle(op->dev.of_node, "phy-handle", 0);
        if (lp->phy_node)
                dev_dbg(lp->dev, "using PHY node %s (%p)\n", np->full_name, np);
@@ -1024,12 +1024,12 @@ static struct of_device_id temac_of_match[] __devinitdata = {
 MODULE_DEVICE_TABLE(of, temac_of_match);
 static struct of_platform_driver temac_of_driver = {
-        .match_table = temac_of_match,
        .probe = temac_of_probe,
        .remove = __devexit_p(temac_of_remove),
        .driver = {
                .owner = THIS_MODULE,
                .name = "xilinx_temac",
+                .of_match_table = temac_of_match,
        },
 };
diff --git a/drivers/net/myri_sbus.c b/drivers/net/myri_sbus.c
index 3898108f98c..1a57c3da1f4 100644
--- a/drivers/net/myri_sbus.c
+++ b/drivers/net/myri_sbus.c
@@ -928,7 +928,7 @@ static const struct net_device_ops myri_ops = {
 static int __devinit myri_sbus_probe(struct of_device *op, const struct of_device_id *match)
 {
-        struct device_node *dp = op->node;
+        struct device_node *dp = op->dev.of_node;
        static unsigned version_printed;
        struct net_device *dev;
        struct myri_eth *mp;
@@ -1161,8 +1161,11 @@ static const struct of_device_id myri_sbus_match[] = {
 MODULE_DEVICE_TABLE(of, myri_sbus_match);
 static struct of_platform_driver myri_sbus_driver = {
-        .name           = "myri",
+        .driver = {
-        .match_table    = myri_sbus_match,
+                .name = "myri",
+                .owner = THIS_MODULE,
+                .of_match_table = myri_sbus_match,
+        },
        .probe          = myri_sbus_probe,
        .remove         = __devexit_p(myri_sbus_remove),
 };
diff --git a/drivers/net/niu.c b/drivers/net/niu.c
index 30abb4e436f..63e8e3893bd 100644
--- a/drivers/net/niu.c
+++ b/drivers/net/niu.c
@@ -9115,7 +9115,7 @@ static int __devinit niu_n2_irq_init(struct niu *np, u8 *ldg_num_map)
        const u32 *int_prop;
        int i;
-        int_prop = of_get_property(op->node, "interrupts", NULL);
+        int_prop = of_get_property(op->dev.of_node, "interrupts", NULL);
        if (!int_prop)
                return -ENODEV;
@@ -9266,7 +9266,7 @@ static int __devinit niu_get_of_props(struct niu *np)
        int prop_len;
        if (np->parent->plat_type == PLAT_TYPE_NIU)
-                dp = np->op->node;
+                dp = np->op->dev.of_node;
        else
                dp = pci_device_to_OF_node(np->pdev);
@@ -10083,10 +10083,10 @@ static int __devinit niu_of_probe(struct of_device *op,
        niu_driver_version();
-        reg = of_get_property(op->node, "reg", NULL);
+        reg = of_get_property(op->dev.of_node, "reg", NULL);
        if (!reg) {
                dev_err(&op->dev, "%s: No 'reg' property, aborting\n",
-                        op->node->full_name);
+                        op->dev.of_node->full_name);
                return -ENODEV;
        }
@@ -10099,7 +10099,7 @@ static int __devinit niu_of_probe(struct of_device *op,
        np = netdev_priv(dev);
        memset(&parent_id, 0, sizeof(parent_id));
-        parent_id.of = of_get_parent(op->node);
+        parent_id.of = of_get_parent(op->dev.of_node);
        np->parent = niu_get_parent(np, &parent_id,
                                    PLAT_TYPE_NIU);
@@ -10234,8 +10234,11 @@ static const struct of_device_id niu_match[] = {
 MODULE_DEVICE_TABLE(of, niu_match);
 static struct of_platform_driver niu_of_driver = {
-        .name           = "niu",
+        .driver = {
-        .match_table    = niu_match,
+                .name = "niu",
+                .owner = THIS_MODULE,
+                .of_match_table = niu_match,
+        },
        .probe          = niu_of_probe,
        .remove         = __devexit_p(niu_of_remove),
 };
diff --git a/drivers/net/phy/mdio-gpio.c b/drivers/net/phy/mdio-gpio.c
index 35897134a5d..fc5fef2a817 100644
--- a/drivers/net/phy/mdio-gpio.c
+++ b/drivers/net/phy/mdio-gpio.c
@@ -199,12 +199,12 @@ static int __devinit mdio_ofgpio_probe(struct of_device *ofdev,
        if (!pdata)
                return -ENOMEM;
-        ret = of_get_gpio(ofdev->node, 0);
+        ret = of_get_gpio(ofdev->dev.of_node, 0);
        if (ret < 0)
                goto out_free;
        pdata->mdc = ret;
-        ret = of_get_gpio(ofdev->node, 1);
+        ret = of_get_gpio(ofdev->dev.of_node, 1);
        if (ret < 0)
                goto out_free;
        pdata->mdio = ret;
@@ -213,7 +213,7 @@ static int __devinit mdio_ofgpio_probe(struct of_device *ofdev,
        if (!new_bus)
                goto out_free;
-        ret = of_mdiobus_register(new_bus, ofdev->node);
+        ret = of_mdiobus_register(new_bus, ofdev->dev.of_node);
        if (ret)
                mdio_gpio_bus_deinit(&ofdev->dev);
@@ -241,8 +241,11 @@ static struct of_device_id mdio_ofgpio_match[] = {
 MODULE_DEVICE_TABLE(of, mdio_ofgpio_match);
 static struct of_platform_driver mdio_ofgpio_driver = {
-        .name = "mdio-gpio",
+        .driver = {
-        .match_table = mdio_ofgpio_match,
+                .name = "mdio-gpio",
+                .owner = THIS_MODULE,
+                .of_match_table = mdio_ofgpio_match,
+        },
        .probe = mdio_ofgpio_probe,
        .remove = __devexit_p(mdio_ofgpio_remove),
 };
diff --git a/drivers/net/sunbmac.c b/drivers/net/sunbmac.c
index 4591fe9bf0b..367e96f317d 100644
--- a/drivers/net/sunbmac.c
+++ b/drivers/net/sunbmac.c
@@ -1131,8 +1131,8 @@ static int __devinit bigmac_ether_init(struct of_device *op,
                goto fail_and_cleanup;
        /* Get supported SBUS burst sizes. */
-        bsizes = of_getintprop_default(qec_op->node, "burst-sizes", 0xff);
+        bsizes = of_getintprop_default(qec_op->dev.of_node, "burst-sizes", 0xff);
-        bsizes_more = of_getintprop_default(qec_op->node, "burst-sizes", 0xff);
+        bsizes_more = of_getintprop_default(qec_op->dev.of_node, "burst-sizes", 0xff);
        bsizes &= 0xff;
        if (bsizes_more != 0xff)
@@ -1184,7 +1184,7 @@ static int __devinit bigmac_ether_init(struct of_device *op,
        }
        /* Get the board revision of this BigMAC. */
-        bp->board_rev = of_getintprop_default(bp->bigmac_op->node,
+        bp->board_rev = of_getintprop_default(bp->bigmac_op->dev.of_node,
                                              "board-version", 1);
        /* Init auto-negotiation timer state. */
@@ -1290,8 +1290,11 @@ static const struct of_device_id bigmac_sbus_match[] = {
 MODULE_DEVICE_TABLE(of, bigmac_sbus_match);
 static struct of_platform_driver bigmac_sbus_driver = {
-        .name           = "sunbmac",
+        .driver = {
-        .match_table    = bigmac_sbus_match,
+                .name = "sunbmac",
+                .owner = THIS_MODULE,
+                .of_match_table = bigmac_sbus_match,
+        },
        .probe          = bigmac_sbus_probe,
        .remove         = __devexit_p(bigmac_sbus_remove),
 };
diff --git a/drivers/net/sunhme.c b/drivers/net/sunhme.c
index 915c5909c7a..3d9650b8d38 100644
--- a/drivers/net/sunhme.c
+++ b/drivers/net/sunhme.c
@@ -2481,7 +2481,7 @@ static void hme_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info
        else {
                const struct linux_prom_registers *regs;
                struct of_device *op = hp->happy_dev;
-                regs = of_get_property(op->node, "regs", NULL);
+                regs = of_get_property(op->dev.of_node, "regs", NULL);
                if (regs)
                        sprintf(info->bus_info, "SBUS:%d",
                                regs->which_io);
@@ -2641,14 +2641,14 @@ static const struct net_device_ops hme_netdev_ops = {
 #ifdef CONFIG_SBUS
 static int __devinit happy_meal_sbus_probe_one(struct of_device *op, int is_qfe)
 {
-        struct device_node *dp = op->node, *sbus_dp;
+        struct device_node *dp = op->dev.of_node, *sbus_dp;
        struct quattro *qp = NULL;
        struct happy_meal *hp;
        struct net_device *dev;
        int i, qfe_slot = -1;
        int err = -ENODEV;
-        sbus_dp = to_of_device(op->dev.parent)->node;
+        sbus_dp = to_of_device(op->dev.parent)->dev.of_node;
        /* We can match PCI devices too, do not accept those here. */
        if (strcmp(sbus_dp->name, "sbus"))
@@ -3237,7 +3237,7 @@ static void happy_meal_pci_exit(void)
 #ifdef CONFIG_SBUS
 static int __devinit hme_sbus_probe(struct of_device *op, const struct of_device_id *match)
 {
-        struct device_node *dp = op->node;
+        struct device_node *dp = op->dev.of_node;
        const char *model = of_get_property(dp, "model", NULL);
        int is_qfe = (match->data != NULL);
@@ -3291,8 +3291,11 @@ static const struct of_device_id hme_sbus_match[] = {
 MODULE_DEVICE_TABLE(of, hme_sbus_match);
 static struct of_platform_driver hme_sbus_driver = {
-        .name           = "hme",
+        .driver = {
-        .match_table    = hme_sbus_match,
+                .name = "hme",
+                .owner = THIS_MODULE,
+                .of_match_table = hme_sbus_match,
+        },
        .probe          = hme_sbus_probe,
        .remove         = __devexit_p(hme_sbus_remove),
 };
diff --git a/drivers/net/sunlance.c b/drivers/net/sunlance.c
index 386af7bbe67..7d9c33dd9d1 100644
--- a/drivers/net/sunlance.c
+++ b/drivers/net/sunlance.c
@@ -1323,7 +1323,7 @@ static int __devinit sparc_lance_probe_one(struct of_device *op,
                                           struct of_device *ledma,
                                           struct of_device *lebuffer)
 {
-        struct device_node *dp = op->node;
+        struct device_node *dp = op->dev.of_node;
        static unsigned version_printed;
        struct lance_private *lp;
        struct net_device *dev;
@@ -1410,7 +1410,7 @@ static int __devinit sparc_lance_probe_one(struct of_device *op,
        lp->burst_sizes = 0;
        if (lp->ledma) {
-                struct device_node *ledma_dp = ledma->node;
+                struct device_node *ledma_dp = ledma->dev.of_node;
                struct device_node *sbus_dp;
                unsigned int sbmask;
                const char *prop;
@@ -1506,7 +1506,7 @@ fail:
 static int __devinit sunlance_sbus_probe(struct of_device *op, const struct of_device_id *match)
 {
        struct of_device *parent = to_of_device(op->dev.parent);
-        struct device_node *parent_dp = parent->node;
+        struct device_node *parent_dp = parent->dev.of_node;
        int err;
        if (!strcmp(parent_dp->name, "ledma")) {
@@ -1545,8 +1545,11 @@ static const struct of_device_id sunlance_sbus_match[] = {
 MODULE_DEVICE_TABLE(of, sunlance_sbus_match);
 static struct of_platform_driver sunlance_sbus_driver = {
-        .name           = "sunlance",
+        .driver = {
-        .match_table    = sunlance_sbus_match,
+                .name = "sunlance",
+                .owner = THIS_MODULE,
+                .of_match_table = sunlance_sbus_match,
+        },
        .probe          = sunlance_sbus_probe,
        .remove         = __devexit_p(sunlance_sbus_remove),
 };
diff --git a/drivers/net/sunqe.c b/drivers/net/sunqe.c
index a7542d25c84..72b579c8d81 100644
--- a/drivers/net/sunqe.c
+++ b/drivers/net/sunqe.c
@@ -695,7 +695,7 @@ static void qe_get_drvinfo(struct net_device *dev, struct ethtool_drvinfo *info)
        strcpy(info->version, "3.0");
        op = qep->op;
-        regs = of_get_property(op->node, "reg", NULL);
+        regs = of_get_property(op->dev.of_node, "reg", NULL);
        if (regs)
                sprintf(info->bus_info, "SBUS:%d", regs->which_io);
@@ -799,7 +799,7 @@ static struct sunqec * __devinit get_qec(struct of_device *child)
                        if (qec_global_reset(qecp->gregs))
                                goto fail;
-                        qecp->qec_bursts = qec_get_burst(op->node);
+                        qecp->qec_bursts = qec_get_burst(op->dev.of_node);
                        qec_init_once(qecp, op);
@@ -857,7 +857,7 @@ static int __devinit qec_ether_init(struct of_device *op)
        res = -ENODEV;
-        i = of_getintprop_default(op->node, "channel#", -1);
+        i = of_getintprop_default(op->dev.of_node, "channel#", -1);
        if (i == -1)
                goto fail;
        qe->channel = i;
@@ -977,8 +977,11 @@ static const struct of_device_id qec_sbus_match[] = {
 MODULE_DEVICE_TABLE(of, qec_sbus_match);
 static struct of_platform_driver qec_sbus_driver = {
-        .name           = "qec",
+        .driver = {
-        .match_table    = qec_sbus_match,
+                .name = "qec",
+                .owner = THIS_MODULE,
+                .of_match_table = qec_sbus_match,
+        },
        .probe          = qec_sbus_probe,
        .remove         = __devexit_p(qec_sbus_remove),
 };
diff --git a/drivers/net/ucc_geth.c b/drivers/net/ucc_geth.c
index 932602db54b..4a34833b85d 100644
--- a/drivers/net/ucc_geth.c
+++ b/drivers/net/ucc_geth.c
@@ -3719,7 +3719,7 @@ static const struct net_device_ops ucc_geth_netdev_ops = {
 static int ucc_geth_probe(struct of_device* ofdev, const struct of_device_id *match)
 {
        struct device *device = &ofdev->dev;
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
        struct net_device *dev = NULL;
        struct ucc_geth_private *ugeth = NULL;
        struct ucc_geth_info *ug_info;
@@ -3963,8 +3963,11 @@ static struct of_device_id ucc_geth_match[] = {
 MODULE_DEVICE_TABLE(of, ucc_geth_match);
 static struct of_platform_driver ucc_geth_driver = {
-        .name           = DRV_NAME,
+        .driver = {
-        .match_table    = ucc_geth_match,
+                .name = DRV_NAME,
+                .owner = THIS_MODULE,
+                .of_match_table = ucc_geth_match,
+        },
        .probe          = ucc_geth_probe,
        .remove         = ucc_geth_remove,
        .suspend        = ucc_geth_suspend,
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 893b552981a..abfa0493236 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -752,7 +752,6 @@ static int ath_key_config(struct ath_common *common,
        struct ath_hw *ah = common->ah;
        struct ath9k_keyval hk;
        const u8 *mac = NULL;
-        u8 gmac[ETH_ALEN];
        int ret = 0;
        int idx;
@@ -776,30 +775,9 @@ static int ath_key_config(struct ath_common *common,
        memcpy(hk.kv_val, key->key, key->keylen);
        if (!(key->flags & IEEE80211_KEY_FLAG_PAIRWISE)) {
+                /* For now, use the default keys for broadcast keys. This may
-                if (key->ap_addr) {
+                 * need to change with virtual interfaces. */
-                        /*
+                idx = key->keyidx;
-                         * Group keys on hardware that supports multicast frame
-                         * key search use a mac that is the sender's address with
-                         * the high bit set instead of the app-specified address.
-                         */
-                        memcpy(gmac, key->ap_addr, ETH_ALEN);
-                        gmac[0] |= 0x80;
-                        mac = gmac;
-                        if (key->alg == ALG_TKIP)
-                                idx = ath_reserve_key_cache_slot_tkip(common);
-                        else
-                                idx = ath_reserve_key_cache_slot(common);
-                        if (idx < 0)
-                                mac = NULL; /* no free key cache entries */
-                }
-                if (!mac) {
-                        /* For now, use the default keys for broadcast keys. This may
-                         * need to change with virtual interfaces. */
-                        idx = key->keyidx;
-                }
        } else if (key->keyidx) {
                if (WARN_ON(!sta))
                        return -EOPNOTSUPP;
diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c
index a7db68d37ee..d04c5b26205 100644
--- a/drivers/net/xilinx_emaclite.c
+++ b/drivers/net/xilinx_emaclite.c
@@ -1088,7 +1088,7 @@ static void xemaclite_remove_ndev(struct net_device *ndev)
 */
 static bool get_bool(struct of_device *ofdev, const char *s)
 {
-        u32 *p = (u32 *)of_get_property(ofdev->node, s, NULL);
+        u32 *p = (u32 *)of_get_property(ofdev->dev.of_node, s, NULL);
        if (p) {
                return (bool)*p;
@@ -1130,14 +1130,14 @@ static int __devinit xemaclite_of_probe(struct of_device *ofdev,
        dev_info(dev, "Device Tree Probing\n");
        /* Get iospace for the device */
-        rc = of_address_to_resource(ofdev->node, 0, &r_mem);
+        rc = of_address_to_resource(ofdev->dev.of_node, 0, &r_mem);
        if (rc) {
                dev_err(dev, "invalid address\n");
                return rc;
        }
        /* Get IRQ for the device */
-        rc = of_irq_to_resource(ofdev->node, 0, &r_irq);
+        rc = of_irq_to_resource(ofdev->dev.of_node, 0, &r_irq);
        if (rc == NO_IRQ) {
                dev_err(dev, "no IRQ found\n");
                return rc;
@@ -1182,7 +1182,7 @@ static int __devinit xemaclite_of_probe(struct of_device *ofdev,
        lp->next_rx_buf_to_use = 0x0;
        lp->tx_ping_pong = get_bool(ofdev, "xlnx,tx-ping-pong");
        lp->rx_ping_pong = get_bool(ofdev, "xlnx,rx-ping-pong");
-        mac_address = of_get_mac_address(ofdev->node);
+        mac_address = of_get_mac_address(ofdev->dev.of_node);
        if (mac_address)
                /* Set the MAC address. */
@@ -1197,7 +1197,7 @@ static int __devinit xemaclite_of_probe(struct of_device *ofdev,
        /* Set the MAC address in the EmacLite device */
        xemaclite_update_address(lp, ndev->dev_addr);
-        lp->phy_node = of_parse_phandle(ofdev->node, "phy-handle", 0);
+        lp->phy_node = of_parse_phandle(ofdev->dev.of_node, "phy-handle", 0);
        rc = xemaclite_mdio_setup(lp, &ofdev->dev);
        if (rc)
                dev_warn(&ofdev->dev, "error registering MDIO bus\n");
@@ -1291,8 +1291,11 @@ static struct of_device_id xemaclite_of_match[] __devinitdata = {
 MODULE_DEVICE_TABLE(of, xemaclite_of_match);
 static struct of_platform_driver xemaclite_of_driver = {
-        .name           = DRIVER_NAME,
+        .driver = {
-        .match_table    = xemaclite_of_match,
+                .name = DRIVER_NAME,
+                .owner = THIS_MODULE,
+                .of_match_table = xemaclite_of_match,
+        },
        .probe          = xemaclite_of_probe,
        .remove         = __devexit_p(xemaclite_of_remove),
 };
diff --git a/drivers/of/device.c b/drivers/of/device.c
index 224ae6bc67b..7d18f8e0b01 100644
--- a/drivers/of/device.c
+++ b/drivers/of/device.c
@@ -10,8 +10,7 @@
 #include <asm/errno.h>
 /**
- * of_match_device - Tell if an of_device structure has a matching
+ * of_match_device - Tell if a struct device matches an of_device_id list
- * of_match structure
 * @ids: array of of device match structures to search in
 * @dev: the of device structure to match against
 *
@@ -19,11 +18,11 @@
 * system is in its list of supported devices.
 */
 const struct of_device_id *of_match_device(const struct of_device_id *matches,
-                                        const struct of_device *dev)
+                                           const struct device *dev)
 {
-        if (!dev->node)
+        if (!dev->of_node)
                return NULL;
-        return of_match_node(matches, dev->node);
+        return of_match_node(matches, dev->of_node);
 }
 EXPORT_SYMBOL(of_match_device);
@@ -54,7 +53,7 @@ static ssize_t devspec_show(struct device *dev,
        struct of_device *ofdev;
        ofdev = to_of_device(dev);
-        return sprintf(buf, "%s\n", ofdev->node->full_name);
+        return sprintf(buf, "%s\n", ofdev->dev.of_node->full_name);
 }
 static ssize_t name_show(struct device *dev,
@@ -63,7 +62,7 @@ static ssize_t name_show(struct device *dev,
        struct of_device *ofdev;
        ofdev = to_of_device(dev);
-        return sprintf(buf, "%s\n", ofdev->node->name);
+        return sprintf(buf, "%s\n", ofdev->dev.of_node->name);
 }
 static ssize_t modalias_show(struct device *dev,
@@ -97,14 +96,14 @@ void of_release_dev(struct device *dev)
        struct of_device *ofdev;
        ofdev = to_of_device(dev);
-        of_node_put(ofdev->node);
+        of_node_put(ofdev->dev.of_node);
        kfree(ofdev);
 }
 EXPORT_SYMBOL(of_release_dev);
 int of_device_register(struct of_device *ofdev)
 {
-        BUG_ON(ofdev->node == NULL);
+        BUG_ON(ofdev->dev.of_node == NULL);
        device_initialize(&ofdev->dev);
@@ -112,7 +111,7 @@ int of_device_register(struct of_device *ofdev)
         * the parent. If there is no parent defined, set the node
         * explicitly */
        if (!ofdev->dev.parent)
-                set_dev_node(&ofdev->dev, of_node_to_nid(ofdev->node));
+                set_dev_node(&ofdev->dev, of_node_to_nid(ofdev->dev.of_node));
        return device_add(&ofdev->dev);
 }
@@ -132,11 +131,11 @@ ssize_t of_device_get_modalias(struct of_device *ofdev,
        ssize_t tsize, csize, repend;
        /* Name & Type */
-        csize = snprintf(str, len, "of:N%sT%s",
+        csize = snprintf(str, len, "of:N%sT%s", ofdev->dev.of_node->name,
-                                ofdev->node->name, ofdev->node->type);
+                         ofdev->dev.of_node->type);
        /* Get compatible property if any */
-        compat = of_get_property(ofdev->node, "compatible", &cplen);
+        compat = of_get_property(ofdev->dev.of_node, "compatible", &cplen);
        if (!compat)
                return csize;
diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c
index dee4fb56b09..b6987bba855 100644
--- a/drivers/of/fdt.c
+++ b/drivers/of/fdt.c
@@ -556,6 +556,21 @@ void __init unflatten_device_tree(void)
        pr_debug(" -> unflatten_device_tree()\n");
+        if (!initial_boot_params) {
+                pr_debug("No device tree pointer\n");
+                return;
+        }
+        pr_debug("Unflattening device tree:\n");
+        pr_debug("magic: %08x\n", be32_to_cpu(initial_boot_params->magic));
+        pr_debug("size: %08x\n", be32_to_cpu(initial_boot_params->totalsize));
+        pr_debug("version: %08x\n", be32_to_cpu(initial_boot_params->version));
+        if (be32_to_cpu(initial_boot_params->magic) != OF_DT_HEADER) {
+                pr_err("Invalid device tree blob header\n");
+                return;
+        }
        /* First pass, scan for size */
        start = ((unsigned long)initial_boot_params) +
                be32_to_cpu(initial_boot_params->off_dt_struct);
diff --git a/drivers/of/of_i2c.c b/drivers/of/of_i2c.c
index a3a708e590d..ab6522c8e4f 100644
--- a/drivers/of/of_i2c.c
+++ b/drivers/of/of_i2c.c
@@ -42,7 +42,7 @@ void of_register_i2c_devices(struct i2c_adapter *adap,
                info.addr = be32_to_cpup(addr);
-                dev_archdata_set_node(&dev_ad, node);
+                info.of_node = node;
                info.archdata = &dev_ad;
                request_module("%s", info.type);
@@ -68,7 +68,7 @@ EXPORT_SYMBOL(of_register_i2c_devices);
 static int of_dev_node_match(struct device *dev, void *data)
 {
-        return dev_archdata_get_node(&dev->archdata) == data;
+        return dev->of_node == data;
 }
 /* must call put_device() when done with returned i2c_client device */
diff --git a/drivers/of/of_mdio.c b/drivers/of/of_mdio.c
index b4748337223..42a6715f8e8 100644
--- a/drivers/of/of_mdio.c
+++ b/drivers/of/of_mdio.c
@@ -79,7 +79,7 @@ int of_mdiobus_register(struct mii_bus *mdio, struct device_node *np)
                /* Associate the OF node with the device structure so it
                 * can be looked up later */
                of_node_get(child);
-                dev_archdata_set_node(&phy->dev.archdata, child);
+                phy->dev.of_node = child;
                /* All data is now stored in the phy struct; register it */
                rc = phy_device_register(phy);
@@ -100,7 +100,7 @@ EXPORT_SYMBOL(of_mdiobus_register);
 /* Helper function for of_phy_find_device */
 static int of_phy_match(struct device *dev, void *phy_np)
 {
-        return dev_archdata_get_node(&dev->archdata) == phy_np;
+        return dev->of_node == phy_np;
 }
 /**
@@ -166,7 +166,7 @@ struct phy_device *of_phy_connect_fixed_link(struct net_device *dev,
        if (!dev->dev.parent)
                return NULL;
-        net_np = dev_archdata_get_node(&dev->dev.parent->archdata);
+        net_np = dev->dev.parent->of_node;
        if (!net_np)
                return NULL;
diff --git a/drivers/of/of_spi.c b/drivers/of/of_spi.c
index f65f48b9844..5fed7e3c7da 100644
--- a/drivers/of/of_spi.c
+++ b/drivers/of/of_spi.c
@@ -79,7 +79,7 @@ void of_register_spi_devices(struct spi_master *master, struct device_node *np)
                /* Store a pointer to the node in the device structure */
                of_node_get(nc);
-                spi->dev.archdata.of_node = nc;
+                spi->dev.of_node = nc;
                /* Register the new device */
                request_module(spi->modalias);
diff --git a/drivers/of/platform.c b/drivers/of/platform.c
index d58ade170c4..7dacc1ebe91 100644
--- a/drivers/of/platform.c
+++ b/drivers/of/platform.c
@@ -21,14 +21,12 @@ extern struct device_attribute of_platform_device_attrs[];
 static int of_platform_bus_match(struct device *dev, struct device_driver *drv)
 {
-        struct of_device *of_dev = to_of_device(dev);
+        const struct of_device_id *matches = drv->of_match_table;
-        struct of_platform_driver *of_drv = to_of_platform_driver(drv);
-        const struct of_device_id *matches = of_drv->match_table;
        if (!matches)
                return 0;
-        return of_match_device(matches, of_dev) != NULL;
+        return of_match_device(matches, dev) != NULL;
 }
 static int of_platform_device_probe(struct device *dev)
@@ -46,7 +44,7 @@ static int of_platform_device_probe(struct device *dev)
        of_dev_get(of_dev);
-        match = of_match_device(drv->match_table, of_dev);
+        match = of_match_device(drv->driver.of_match_table, dev);
        if (match)
                error = drv->probe(of_dev, match);
        if (error)
@@ -386,11 +384,6 @@ int of_bus_type_init(struct bus_type *bus, const char *name)
 int of_register_driver(struct of_platform_driver *drv, struct bus_type *bus)
 {
-        /* initialize common driver fields */
-        if (!drv->driver.name)
-                drv->driver.name = drv->name;
-        if (!drv->driver.owner)
-                drv->driver.owner = drv->owner;
        drv->driver.bus = bus;
        /* register with core */
diff --git a/drivers/parport/parport_sunbpp.c b/drivers/parport/parport_sunbpp.c
index 065f229580d..9a5b4b89416 100644
--- a/drivers/parport/parport_sunbpp.c
+++ b/drivers/parport/parport_sunbpp.c
@@ -382,8 +382,11 @@ static const struct of_device_id bpp_match[] = {
 MODULE_DEVICE_TABLE(of, bpp_match);
 static struct of_platform_driver bpp_sbus_driver = {
-        .name           = "bpp",
+        .driver = {
-        .match_table    = bpp_match,
+                .name = "bpp",
+                .owner = THIS_MODULE,
+                .of_match_table = bpp_match,
+        },
        .probe          = bpp_probe,
        .remove         = __devexit_p(bpp_remove),
 };
diff --git a/drivers/pcmcia/electra_cf.c b/drivers/pcmcia/electra_cf.c
index 2e59fe947d2..f94d8281cfb 100644
--- a/drivers/pcmcia/electra_cf.c
+++ b/drivers/pcmcia/electra_cf.c
@@ -185,7 +185,7 @@ static int __devinit electra_cf_probe(struct of_device *ofdev,
                                      const struct of_device_id *match)
 {
        struct device *device = &ofdev->dev;
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
        struct electra_cf_socket   *cf;
        struct resource mem, io;
        int status;
@@ -357,8 +357,11 @@ static const struct of_device_id electra_cf_match[] = {
 MODULE_DEVICE_TABLE(of, electra_cf_match);
 static struct of_platform_driver electra_cf_driver = {
-        .name      = (char *)driver_name,
+        .driver = {
-        .match_table    = electra_cf_match,
+                .name = (char *)driver_name,
+                .owner = THIS_MODULE,
+                .of_match_table = electra_cf_match,
+        },
        .probe    = electra_cf_probe,
        .remove   = electra_cf_remove,
 };
diff --git a/drivers/pcmcia/m8xx_pcmcia.c b/drivers/pcmcia/m8xx_pcmcia.c
index 41cc954a5ff..1a648b90b63 100644
--- a/drivers/pcmcia/m8xx_pcmcia.c
+++ b/drivers/pcmcia/m8xx_pcmcia.c
@@ -1298,8 +1298,11 @@ static const struct of_device_id m8xx_pcmcia_match[] = {
 MODULE_DEVICE_TABLE(of, m8xx_pcmcia_match);
 static struct of_platform_driver m8xx_pcmcia_driver = {
-        .name = driver_name,
+        .driver = {
-        .match_table = m8xx_pcmcia_match,
+                .name = driver_name,
+                .owner = THIS_MODULE,
+                .match_table = m8xx_pcmcia_match,
+        },
        .probe = m8xx_probe,
        .remove = m8xx_remove,
 };
diff --git a/drivers/sbus/char/bbc_envctrl.c b/drivers/sbus/char/bbc_envctrl.c
index b4951eb0358..103fdf6b0b8 100644
--- a/drivers/sbus/char/bbc_envctrl.c
+++ b/drivers/sbus/char/bbc_envctrl.c
@@ -565,9 +565,9 @@ int bbc_envctrl_init(struct bbc_i2c_bus *bp)
        int devidx = 0;
        while ((op = bbc_i2c_getdev(bp, devidx++)) != NULL) {
-                if (!strcmp(op->node->name, "temperature"))
+                if (!strcmp(op->dev.of_node->name, "temperature"))
                        attach_one_temp(bp, op, temp_index++);
-                if (!strcmp(op->node->name, "fan-control"))
+                if (!strcmp(op->dev.of_node->name, "fan-control"))
                        attach_one_fan(bp, op, fan_index++);
        }
        if (temp_index != 0 && fan_index != 0) {
diff --git a/drivers/sbus/char/bbc_i2c.c b/drivers/sbus/char/bbc_i2c.c
index 7e30e5f6e03..8bfdd63a1fc 100644
--- a/drivers/sbus/char/bbc_i2c.c
+++ b/drivers/sbus/char/bbc_i2c.c
@@ -97,7 +97,7 @@ struct bbc_i2c_client *bbc_i2c_attach(struct bbc_i2c_bus *bp, struct of_device *
        client->bp = bp;
        client->op = op;
-        reg = of_get_property(op->node, "reg", NULL);
+        reg = of_get_property(op->dev.of_node, "reg", NULL);
        if (!reg) {
                kfree(client);
                return NULL;
@@ -327,7 +327,7 @@ static struct bbc_i2c_bus * __init attach_one_i2c(struct of_device *op, int inde
        spin_lock_init(&bp->lock);
        entry = 0;
-        for (dp = op->node->child;
+        for (dp = op->dev.of_node->child;
             dp && entry < 8;
             dp = dp->sibling, entry++) {
                struct of_device *child_op;
@@ -414,8 +414,11 @@ static const struct of_device_id bbc_i2c_match[] = {
 MODULE_DEVICE_TABLE(of, bbc_i2c_match);
 static struct of_platform_driver bbc_i2c_driver = {
-        .name           = "bbc_i2c",
+        .driver = {
-        .match_table    = bbc_i2c_match,
+                .name = "bbc_i2c",
+                .owner = THIS_MODULE,
+                .of_match_table = bbc_i2c_match,
+        },
        .probe          = bbc_i2c_probe,
        .remove         = __devexit_p(bbc_i2c_remove),
 };
diff --git a/drivers/sbus/char/display7seg.c b/drivers/sbus/char/display7seg.c
index 3e59189f413..7baf1b64403 100644
--- a/drivers/sbus/char/display7seg.c
+++ b/drivers/sbus/char/display7seg.c
@@ -216,7 +216,7 @@ static int __devinit d7s_probe(struct of_device *op,
        writeb(regs,  p->regs);
        printk(KERN_INFO PFX "7-Segment Display%s at [%s:0x%llx] %s\n",
-               op->node->full_name,
+               op->dev.of_node->full_name,
               (regs & D7S_FLIP) ? " (FLIPPED)" : "",
               op->resource[0].start,
               sol_compat ? "in sol_compat mode" : "");
@@ -266,8 +266,11 @@ static const struct of_device_id d7s_match[] = {
 MODULE_DEVICE_TABLE(of, d7s_match);
 static struct of_platform_driver d7s_driver = {
-        .name           = DRIVER_NAME,
+        .driver = {
-        .match_table    = d7s_match,
+                .name = DRIVER_NAME,
+                .owner = THIS_MODULE,
+                .of_match_table = d7s_match,
+        },
        .probe          = d7s_probe,
        .remove         = __devexit_p(d7s_remove),
 };
diff --git a/drivers/sbus/char/envctrl.c b/drivers/sbus/char/envctrl.c
index c6e2eff1940..c8166ecf527 100644
--- a/drivers/sbus/char/envctrl.c
+++ b/drivers/sbus/char/envctrl.c
@@ -1043,7 +1043,7 @@ static int __devinit envctrl_probe(struct of_device *op,
                return -ENOMEM;
        index = 0;
-        dp = op->node->child;
+        dp = op->dev.of_node->child;
        while (dp) {
                if (!strcmp(dp->name, "gpio")) {
                        i2c_childlist[index].i2ctype = I2C_GPIO;
@@ -1131,8 +1131,11 @@ static const struct of_device_id envctrl_match[] = {
 MODULE_DEVICE_TABLE(of, envctrl_match);
 static struct of_platform_driver envctrl_driver = {
-        .name           = DRIVER_NAME,
+        .driver = {
-        .match_table    = envctrl_match,
+                .name = DRIVER_NAME,
+                .owner = THIS_MODULE,
+                .of_match_table = envctrl_match,
+        },
        .probe          = envctrl_probe,
        .remove         = __devexit_p(envctrl_remove),
 };
diff --git a/drivers/sbus/char/flash.c b/drivers/sbus/char/flash.c
index d3b62eb0fba..368d66294d8 100644
--- a/drivers/sbus/char/flash.c
+++ b/drivers/sbus/char/flash.c
@@ -162,7 +162,7 @@ static struct miscdevice flash_dev = { FLASH_MINOR, "flash", &flash_fops };
 static int __devinit flash_probe(struct of_device *op,
                                 const struct of_device_id *match)
 {
-        struct device_node *dp = op->node;
+        struct device_node *dp = op->dev.of_node;
        struct device_node *parent;
        parent = dp->parent;
@@ -184,7 +184,7 @@ static int __devinit flash_probe(struct of_device *op,
        flash.busy = 0;
        printk(KERN_INFO "%s: OBP Flash, RD %lx[%lx] WR %lx[%lx]\n",
-               op->node->full_name,
+               op->dev.of_node->full_name,
               flash.read_base, flash.read_size,
               flash.write_base, flash.write_size);
@@ -207,8 +207,11 @@ static const struct of_device_id flash_match[] = {
 MODULE_DEVICE_TABLE(of, flash_match);
 static struct of_platform_driver flash_driver = {
-        .name           = "flash",
+        .driver = {
-        .match_table    = flash_match,
+                .name = "flash",
+                .owner = THIS_MODULE,
+                .of_match_table = flash_match,
+        },
        .probe          = flash_probe,
        .remove         = __devexit_p(flash_remove),
 };
diff --git a/drivers/sbus/char/uctrl.c b/drivers/sbus/char/uctrl.c
index 2c56fd56ec6..5f253665a1d 100644
--- a/drivers/sbus/char/uctrl.c
+++ b/drivers/sbus/char/uctrl.c
@@ -382,7 +382,7 @@ static int __devinit uctrl_probe(struct of_device *op,
        sbus_writel(UCTRL_INTR_RXNE_REQ|UCTRL_INTR_RXNE_MSK, &p->regs->uctrl_intr);
        printk(KERN_INFO "%s: uctrl regs[0x%p] (irq %d)\n",
-               op->node->full_name, p->regs, p->irq);
+               op->dev.of_node->full_name, p->regs, p->irq);
        uctrl_get_event_status(p);
        uctrl_get_external_status(p);
@@ -425,8 +425,11 @@ static const struct of_device_id uctrl_match[] = {
 MODULE_DEVICE_TABLE(of, uctrl_match);
 static struct of_platform_driver uctrl_driver = {
-        .name           = "uctrl",
+        .driver = {
-        .match_table    = uctrl_match,
+                .name = "uctrl",
+                .owner = THIS_MODULE,
+                .of_match_table = uctrl_match,
+        },
        .probe          = uctrl_probe,
        .remove         = __devexit_p(uctrl_remove),
 };
diff --git a/drivers/scsi/ibmvscsi/ibmvfc.c b/drivers/scsi/ibmvscsi/ibmvfc.c
index 3eb2b7b3d8b..fef49521cbc 100644
--- a/drivers/scsi/ibmvscsi/ibmvfc.c
+++ b/drivers/scsi/ibmvscsi/ibmvfc.c
@@ -1157,7 +1157,7 @@ static void ibmvfc_gather_partition_info(struct ibmvfc_host *vhost)
 static void ibmvfc_set_login_info(struct ibmvfc_host *vhost)
 {
        struct ibmvfc_npiv_login *login_info = &vhost->login_info;
-        struct device_node *of_node = vhost->dev->archdata.of_node;
+        struct device_node *of_node = vhost->dev->of_node;
        const char *location;
        memset(login_info, 0, sizeof(*login_info));
diff --git a/drivers/scsi/ibmvscsi/ibmvscsi.c b/drivers/scsi/ibmvscsi/ibmvscsi.c
index 88bad0e81bd..aad35cc41e4 100644
--- a/drivers/scsi/ibmvscsi/ibmvscsi.c
+++ b/drivers/scsi/ibmvscsi/ibmvscsi.c
@@ -932,7 +932,7 @@ static void send_mad_capabilities(struct ibmvscsi_host_data *hostdata)
        struct viosrp_capabilities *req;
        struct srp_event_struct *evt_struct;
        unsigned long flags;
-        struct device_node *of_node = hostdata->dev->archdata.of_node;
+        struct device_node *of_node = hostdata->dev->of_node;
        const char *location;
        evt_struct = get_event_struct(&hostdata->pool);
diff --git a/drivers/scsi/qlogicpti.c b/drivers/scsi/qlogicpti.c
index aa406497eeb..ca5c15c779c 100644
--- a/drivers/scsi/qlogicpti.c
+++ b/drivers/scsi/qlogicpti.c
@@ -755,7 +755,7 @@ static void __devinit qpti_get_scsi_id(struct qlogicpti *qpti)
        struct of_device *op = qpti->op;
        struct device_node *dp;
-        dp = op->node;
+        dp = op->dev.of_node;
        qpti->scsi_id = of_getintprop_default(dp, "initiator-id", -1);
        if (qpti->scsi_id == -1)
@@ -776,8 +776,8 @@ static void qpti_get_bursts(struct qlogicpti *qpti)
        struct of_device *op = qpti->op;
        u8 bursts, bmask;
-        bursts = of_getintprop_default(op->node, "burst-sizes", 0xff);
+        bursts = of_getintprop_default(op->dev.of_node, "burst-sizes", 0xff);
-        bmask = of_getintprop_default(op->node->parent, "burst-sizes", 0xff);
+        bmask = of_getintprop_default(op->dev.of_node->parent, "burst-sizes", 0xff);
        if (bmask != 0xff)
                bursts &= bmask;
        if (bursts == 0xff ||
@@ -1293,7 +1293,7 @@ static struct scsi_host_template qpti_template = {
 static int __devinit qpti_sbus_probe(struct of_device *op, const struct of_device_id *match)
 {
        struct scsi_host_template *tpnt = match->data;
-        struct device_node *dp = op->node;
+        struct device_node *dp = op->dev.of_node;
        struct Scsi_Host *host;
        struct qlogicpti *qpti;
        static int nqptis;
@@ -1315,7 +1315,7 @@ static int __devinit qpti_sbus_probe(struct of_device *op, const struct of_devic
        qpti->qhost = host;
        qpti->op = op;
        qpti->qpti_id = nqptis;
-        strcpy(qpti->prom_name, op->node->name);
+        strcpy(qpti->prom_name, op->dev.of_node->name);
        qpti->is_pti = strcmp(qpti->prom_name, "QLGC,isp");
        if (qpti_map_regs(qpti) < 0)
@@ -1456,8 +1456,11 @@ static const struct of_device_id qpti_match[] = {
 MODULE_DEVICE_TABLE(of, qpti_match);
 static struct of_platform_driver qpti_sbus_driver = {
-        .name           = "qpti",
+        .driver = {
-        .match_table    = qpti_match,
+                .name = "qpti",
+                .owner = THIS_MODULE,
+                .of_match_table = qpti_match,
+        },
        .probe          = qpti_sbus_probe,
        .remove         = __devexit_p(qpti_sbus_remove),
 };
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index c992ecf4e37..9798c2c06b9 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -1220,7 +1220,7 @@ static void scsi_sequential_lun_scan(struct scsi_target *starget,
 }
 /**
- * scsilun_to_int: convert a scsi_lun to an int
+ * scsilun_to_int - convert a scsi_lun to an int
 * @scsilun:    struct scsi_lun to be converted.
 *
 * Description:
@@ -1252,7 +1252,7 @@ int scsilun_to_int(struct scsi_lun *scsilun)
 EXPORT_SYMBOL(scsilun_to_int);
 /**
- * int_to_scsilun: reverts an int into a scsi_lun
+ * int_to_scsilun - reverts an int into a scsi_lun
 * @lun:        integer to be reverted
 * @scsilun:    struct scsi_lun to be set.
 *
@@ -1876,12 +1876,9 @@ void scsi_forget_host(struct Scsi_Host *shost)
        spin_unlock_irqrestore(shost->host_lock, flags);
 }
-/*
+/**
- * Function:    scsi_get_host_dev()
+ * scsi_get_host_dev - Create a scsi_device that points to the host adapter itself
- *
+ * @shost: Host that needs a scsi_device
- * Purpose:     Create a scsi_device that points to the host adapter itself.
- *
- * Arguments:   SHpnt   - Host that needs a scsi_device
 *
 * Lock status: None assumed.
 *
@@ -1894,7 +1891,7 @@ void scsi_forget_host(struct Scsi_Host *shost)
 *
 *      Note - this device is not accessible from any high-level
 *      drivers (including generics), which is probably not
- *      optimal.  We can add hooks later to attach 
+ *      optimal.  We can add hooks later to attach.
 */
 struct scsi_device *scsi_get_host_dev(struct Scsi_Host *shost)
 {
@@ -1920,18 +1917,13 @@ struct scsi_device *scsi_get_host_dev(struct Scsi_Host *shost)
 }
 EXPORT_SYMBOL(scsi_get_host_dev);
-/*
+/**
- * Function:    scsi_free_host_dev()
+ * scsi_free_host_dev - Free a scsi_device that points to the host adapter itself
- *
+ * @sdev: Host device to be freed
- * Purpose:     Free a scsi_device that points to the host adapter itself.
- *
- * Arguments:   SHpnt   - Host that needs a scsi_device
 *
 * Lock status: None assumed.
 *
 * Returns:     Nothing
- *
- * Notes:
 */
 void scsi_free_host_dev(struct scsi_device *sdev)
 {
diff --git a/drivers/scsi/sun_esp.c b/drivers/scsi/sun_esp.c
index fc23d273fb1..386dd9d602b 100644
--- a/drivers/scsi/sun_esp.c
+++ b/drivers/scsi/sun_esp.c
@@ -125,7 +125,7 @@ static void __devinit esp_get_scsi_id(struct esp *esp, struct of_device *espdma)
        struct of_device *op = esp->dev;
        struct device_node *dp;
-        dp = op->node;
+        dp = op->dev.of_node;
        esp->scsi_id = of_getintprop_default(dp, "initiator-id", 0xff);
        if (esp->scsi_id != 0xff)
                goto done;
@@ -134,7 +134,7 @@ static void __devinit esp_get_scsi_id(struct esp *esp, struct of_device *espdma)
        if (esp->scsi_id != 0xff)
                goto done;
-        esp->scsi_id = of_getintprop_default(espdma->node,
+        esp->scsi_id = of_getintprop_default(espdma->dev.of_node,
                                             "scsi-initiator-id", 7);
 done:
@@ -147,7 +147,7 @@ static void __devinit esp_get_differential(struct esp *esp)
        struct of_device *op = esp->dev;
        struct device_node *dp;
-        dp = op->node;
+        dp = op->dev.of_node;
        if (of_find_property(dp, "differential", NULL))
                esp->flags |= ESP_FLAG_DIFFERENTIAL;
        else
@@ -160,7 +160,7 @@ static void __devinit esp_get_clock_params(struct esp *esp)
        struct device_node *bus_dp, *dp;
        int fmhz;
-        dp = op->node;
+        dp = op->dev.of_node;
        bus_dp = dp->parent;
        fmhz = of_getintprop_default(dp, "clock-frequency", 0);
@@ -172,12 +172,12 @@ static void __devinit esp_get_clock_params(struct esp *esp)
 static void __devinit esp_get_bursts(struct esp *esp, struct of_device *dma_of)
 {
-        struct device_node *dma_dp = dma_of->node;
+        struct device_node *dma_dp = dma_of->dev.of_node;
        struct of_device *op = esp->dev;
        struct device_node *dp;
        u8 bursts, val;
-        dp = op->node;
+        dp = op->dev.of_node;
        bursts = of_getintprop_default(dp, "burst-sizes", 0xff);
        val = of_getintprop_default(dma_dp, "burst-sizes", 0xff);
        if (val != 0xff)
@@ -565,7 +565,7 @@ fail:
 static int __devinit esp_sbus_probe(struct of_device *op, const struct of_device_id *match)
 {
        struct device_node *dma_node = NULL;
-        struct device_node *dp = op->node;
+        struct device_node *dp = op->dev.of_node;
        struct of_device *dma_of = NULL;
        int hme = 0;
@@ -574,7 +574,7 @@ static int __devinit esp_sbus_probe(struct of_device *op, const struct of_device
             !strcmp(dp->parent->name, "dma")))
                dma_node = dp->parent;
        else if (!strcmp(dp->name, "SUNW,fas")) {
-                dma_node = op->node;
+                dma_node = op->dev.of_node;
                hme = 1;
        }
        if (dma_node)
@@ -633,8 +633,11 @@ static const struct of_device_id esp_match[] = {
 MODULE_DEVICE_TABLE(of, esp_match);
 static struct of_platform_driver esp_sbus_driver = {
-        .name           = "esp",
+        .driver = {
-        .match_table    = esp_match,
+                .name = "esp",
+                .owner = THIS_MODULE,
+                .of_match_table = esp_match,
+        },
        .probe          = esp_sbus_probe,
        .remove         = __devexit_p(esp_sbus_remove),
 };
diff --git a/drivers/serial/apbuart.c b/drivers/serial/apbuart.c
index fe91319b5f6..0099b8692b6 100644
--- a/drivers/serial/apbuart.c
+++ b/drivers/serial/apbuart.c
@@ -559,7 +559,7 @@ static int __devinit apbuart_probe(struct of_device *op,
        i = 0;
        for (i = 0; i < grlib_apbuart_port_nr; i++) {
-                if (op->node == grlib_apbuart_nodes[i])
+                if (op->dev.of_node == grlib_apbuart_nodes[i])
                        break;
        }
@@ -584,12 +584,12 @@ static struct of_device_id __initdata apbuart_match[] = {
 };
 static struct of_platform_driver grlib_apbuart_of_driver = {
-        .match_table = apbuart_match,
        .probe = apbuart_probe,
        .driver = {
-                   .owner = THIS_MODULE,
+                .owner = THIS_MODULE,
-                   .name = "grlib-apbuart",
+                .name = "grlib-apbuart",
-                   },
+                .of_match_table = apbuart_match,
+        },
 };
diff --git a/drivers/serial/cpm_uart/cpm_uart_core.c b/drivers/serial/cpm_uart/cpm_uart_core.c
index 300cea768d7..9eb62a256e9 100644
--- a/drivers/serial/cpm_uart/cpm_uart_core.c
+++ b/drivers/serial/cpm_uart/cpm_uart_core.c
@@ -1342,7 +1342,7 @@ static int __devinit cpm_uart_probe(struct of_device *ofdev,
        /* initialize the device pointer for the port */
        pinfo->port.dev = &ofdev->dev;
-        ret = cpm_uart_init_port(ofdev->node, pinfo);
+        ret = cpm_uart_init_port(ofdev->dev.of_node, pinfo);
        if (ret)
                return ret;
@@ -1372,8 +1372,11 @@ static struct of_device_id cpm_uart_match[] = {
 };
 static struct of_platform_driver cpm_uart_driver = {
-        .name = "cpm_uart",
+        .driver = {
-        .match_table = cpm_uart_match,
+                .name = "cpm_uart",
+                .owner = THIS_MODULE,
+                .of_match_table = cpm_uart_match,
+        },
        .probe = cpm_uart_probe,
        .remove = cpm_uart_remove,
 };
diff --git a/drivers/serial/mpc52xx_uart.c b/drivers/serial/mpc52xx_uart.c
index 02469c31bf0..beb4710faee 100644
--- a/drivers/serial/mpc52xx_uart.c
+++ b/drivers/serial/mpc52xx_uart.c
@@ -1295,14 +1295,14 @@ mpc52xx_uart_of_probe(struct of_device *op, const struct of_device_id *match)
        /* Check validity & presence */
        for (idx = 0; idx < MPC52xx_PSC_MAXNUM; idx++)
-                if (mpc52xx_uart_nodes[idx] == op->node)
+                if (mpc52xx_uart_nodes[idx] == op->dev.of_node)
                        break;
        if (idx >= MPC52xx_PSC_MAXNUM)
                return -EINVAL;
        pr_debug("Found %s assigned to ttyPSC%x\n",
                 mpc52xx_uart_nodes[idx]->full_name, idx);
-        uartclk = psc_ops->getuartclk(op->node);
+        uartclk = psc_ops->getuartclk(op->dev.of_node);
        if (uartclk == 0) {
                dev_dbg(&op->dev, "Could not find uart clock frequency!\n");
                return -EINVAL;
@@ -1322,7 +1322,7 @@ mpc52xx_uart_of_probe(struct of_device *op, const struct of_device_id *match)
        port->dev       = &op->dev;
        /* Search for IRQ and mapbase */
-        ret = of_address_to_resource(op->node, 0, &res);
+        ret = of_address_to_resource(op->dev.of_node, 0, &res);
        if (ret)
                return ret;
@@ -1332,7 +1332,7 @@ mpc52xx_uart_of_probe(struct of_device *op, const struct of_device_id *match)
                return -EINVAL;
        }
-        psc_ops->get_irq(port, op->node);
+        psc_ops->get_irq(port, op->dev.of_node);
        if (port->irq == NO_IRQ) {
                dev_dbg(&op->dev, "Could not get irq\n");
                return -EINVAL;
@@ -1431,15 +1431,16 @@ mpc52xx_uart_of_enumerate(void)
 MODULE_DEVICE_TABLE(of, mpc52xx_uart_of_match);
 static struct of_platform_driver mpc52xx_uart_of_driver = {
-        .match_table    = mpc52xx_uart_of_match,
        .probe          = mpc52xx_uart_of_probe,
        .remove         = mpc52xx_uart_of_remove,
 #ifdef CONFIG_PM
        .suspend        = mpc52xx_uart_of_suspend,
        .resume         = mpc52xx_uart_of_resume,
 #endif
-        .driver         = {
+        .driver = {
-                .name   = "mpc52xx-psc-uart",
+                .name = "mpc52xx-psc-uart",
+                .owner = THIS_MODULE,
+                .of_match_table = mpc52xx_uart_of_match,
        },
 };
diff --git a/drivers/serial/nwpserial.c b/drivers/serial/nwpserial.c
index e1ab8ec0a4a..3c02fa96f28 100644
--- a/drivers/serial/nwpserial.c
+++ b/drivers/serial/nwpserial.c
@@ -344,7 +344,7 @@ int nwpserial_register_port(struct uart_port *port)
        mutex_lock(&nwpserial_mutex);
-        dn = to_of_device(port->dev)->node;
+        dn = to_of_device(port->dev)->dev.of_node;
        if (dn == NULL)
                goto out;
diff --git a/drivers/serial/of_serial.c b/drivers/serial/of_serial.c
index 4abfebdb0fc..a48d9080f55 100644
--- a/drivers/serial/of_serial.c
+++ b/drivers/serial/of_serial.c
@@ -31,7 +31,7 @@ static int __devinit of_platform_serial_setup(struct of_device *ofdev,
                                        int type, struct uart_port *port)
 {
        struct resource resource;
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
        const unsigned int *clk, *spd;
        const u32 *prop;
        int ret, prop_size;
@@ -88,7 +88,7 @@ static int __devinit of_platform_serial_probe(struct of_device *ofdev,
        int port_type;
        int ret;
-        if (of_find_property(ofdev->node, "used-by-rtas", NULL))
+        if (of_find_property(ofdev->dev.of_node, "used-by-rtas", NULL))
                return -EBUSY;
        info = kmalloc(sizeof(*info), GFP_KERNEL);
@@ -175,11 +175,13 @@ static struct of_device_id __devinitdata of_platform_serial_table[] = {
 };
 static struct of_platform_driver of_platform_serial_driver = {
-        .owner = THIS_MODULE,
+        .driver = {
-        .name = "of_serial",
+                .name = "of_serial",
+                .owner = THIS_MODULE,
+                .of_match_table = of_platform_serial_table,
+        },
        .probe = of_platform_serial_probe,
        .remove = of_platform_serial_remove,
-        .match_table = of_platform_serial_table,
 };
 static int __init of_platform_serial_init(void)
diff --git a/drivers/serial/pmac_zilog.c b/drivers/serial/pmac_zilog.c
index 700e10833bf..cabbdc7ba58 100644
--- a/drivers/serial/pmac_zilog.c
+++ b/drivers/serial/pmac_zilog.c
@@ -1611,7 +1611,7 @@ static int pmz_attach(struct macio_dev *mdev, const struct of_device_id *match)
        /* Iterate the pmz_ports array to find a matching entry
         */
        for (i = 0; i < MAX_ZS_PORTS; i++)
-                if (pmz_ports[i].node == mdev->ofdev.node) {
+                if (pmz_ports[i].node == mdev->ofdev.dev.of_node) {
                        struct uart_pmac_port *uap = &pmz_ports[i];
                        uap->dev = mdev;
diff --git a/drivers/serial/sh-sci.c b/drivers/serial/sh-sci.c
index 4f73fb75674..5f90fcd7d10 100644
--- a/drivers/serial/sh-sci.c
+++ b/drivers/serial/sh-sci.c
@@ -1004,8 +1004,9 @@ static void sci_rx_dma_release(struct sci_port *s, bool enable_pio)
        s->chan_rx = NULL;
        s->cookie_rx[0] = s->cookie_rx[1] = -EINVAL;
        dma_release_channel(chan);
-        dma_free_coherent(port->dev, s->buf_len_rx * 2,
+        if (sg_dma_address(&s->sg_rx[0]))
-                          sg_virt(&s->sg_rx[0]), sg_dma_address(&s->sg_rx[0]));
+                dma_free_coherent(port->dev, s->buf_len_rx * 2,
+                                  sg_virt(&s->sg_rx[0]), sg_dma_address(&s->sg_rx[0]));
        if (enable_pio)
                sci_start_rx(port);
 }
diff --git a/drivers/serial/sunhv.c b/drivers/serial/sunhv.c
index d14cca7fb88..890f9174296 100644
--- a/drivers/serial/sunhv.c
+++ b/drivers/serial/sunhv.c
@@ -565,7 +565,7 @@ static int __devinit hv_probe(struct of_device *op, const struct of_device_id *m
        if (err)
                goto out_free_con_read_page;
-        sunserial_console_match(&sunhv_console, op->node,
+        sunserial_console_match(&sunhv_console, op->dev.of_node,
                                &sunhv_reg, port->line, false);
        err = uart_add_one_port(&sunhv_reg, port);
@@ -630,8 +630,11 @@ static const struct of_device_id hv_match[] = {
 MODULE_DEVICE_TABLE(of, hv_match);
 static struct of_platform_driver hv_driver = {
-        .name           = "hv",
+        .driver = {
-        .match_table    = hv_match,
+                .name = "hv",
+                .owner = THIS_MODULE,
+                .of_match_table = hv_match,
+        },
        .probe          = hv_probe,
        .remove         = __devexit_p(hv_remove),
 };
diff --git a/drivers/serial/sunsab.c b/drivers/serial/sunsab.c
index d2e0321049e..5e81bc6b48b 100644
--- a/drivers/serial/sunsab.c
+++ b/drivers/serial/sunsab.c
@@ -883,7 +883,7 @@ static int sunsab_console_setup(struct console *con, char *options)
        printk("Console: ttyS%d (SAB82532)\n",
               (sunsab_reg.minor - 64) + con->index);
-        sunserial_console_termios(con, to_of_device(up->port.dev)->node);
+        sunserial_console_termios(con, to_of_device(up->port.dev)->dev.of_node);
        switch (con->cflag & CBAUD) {
        case B150: baud = 150; break;
@@ -1026,11 +1026,11 @@ static int __devinit sab_probe(struct of_device *op, const struct of_device_id *
        if (err)
                goto out1;
-        sunserial_console_match(SUNSAB_CONSOLE(), op->node,
+        sunserial_console_match(SUNSAB_CONSOLE(), op->dev.of_node,
                                &sunsab_reg, up[0].port.line,
                                false);
-        sunserial_console_match(SUNSAB_CONSOLE(), op->node,
+        sunserial_console_match(SUNSAB_CONSOLE(), op->dev.of_node,
                                &sunsab_reg, up[1].port.line,
                                false);
@@ -1093,8 +1093,11 @@ static const struct of_device_id sab_match[] = {
 MODULE_DEVICE_TABLE(of, sab_match);
 static struct of_platform_driver sab_driver = {
-        .name           = "sab",
+        .driver = {
-        .match_table    = sab_match,
+                .name = "sab",
+                .owner = THIS_MODULE,
+                .of_match_table = sab_match,
+        },
        .probe          = sab_probe,
        .remove         = __devexit_p(sab_remove),
 };
diff --git a/drivers/serial/sunsu.c b/drivers/serial/sunsu.c
index 01f7731e59b..234459c2f01 100644
--- a/drivers/serial/sunsu.c
+++ b/drivers/serial/sunsu.c
@@ -1200,7 +1200,7 @@ static int __devinit sunsu_kbd_ms_init(struct uart_sunsu_port *up)
                return -ENODEV;
        printk("%s: %s port at %llx, irq %u\n",
-               to_of_device(up->port.dev)->node->full_name,
+               to_of_device(up->port.dev)->dev.of_node->full_name,
               (up->su_type == SU_PORT_KBD) ? "Keyboard" : "Mouse",
               (unsigned long long) up->port.mapbase,
               up->port.irq);
@@ -1352,7 +1352,7 @@ static int __init sunsu_console_setup(struct console *co, char *options)
        spin_lock_init(&port->lock);
        /* Get firmware console settings.  */
-        sunserial_console_termios(co, to_of_device(port->dev)->node);
+        sunserial_console_termios(co, to_of_device(port->dev)->dev.of_node);
        memset(&termios, 0, sizeof(struct ktermios));
        termios.c_cflag = co->cflag;
@@ -1409,7 +1409,7 @@ static enum su_type __devinit su_get_type(struct device_node *dp)
 static int __devinit su_probe(struct of_device *op, const struct of_device_id *match)
 {
        static int inst;
-        struct device_node *dp = op->node;
+        struct device_node *dp = op->dev.of_node;
        struct uart_sunsu_port *up;
        struct resource *rp;
        enum su_type type;
@@ -1539,8 +1539,11 @@ static const struct of_device_id su_match[] = {
 MODULE_DEVICE_TABLE(of, su_match);
 static struct of_platform_driver su_driver = {
-        .name           = "su",
+        .driver = {
-        .match_table    = su_match,
+                .name = "su",
+                .owner = THIS_MODULE,
+                .of_match_table = su_match,
+        },
        .probe          = su_probe,
        .remove         = __devexit_p(su_remove),
 };
diff --git a/drivers/serial/sunzilog.c b/drivers/serial/sunzilog.c
index 978b3cee02d..f9a24f4ebb3 100644
--- a/drivers/serial/sunzilog.c
+++ b/drivers/serial/sunzilog.c
@@ -1230,7 +1230,7 @@ static int __init sunzilog_console_setup(struct console *con, char *options)
               (sunzilog_reg.minor - 64) + con->index, con->index);
        /* Get firmware console settings.  */
-        sunserial_console_termios(con, to_of_device(up->port.dev)->node);
+        sunserial_console_termios(con, to_of_device(up->port.dev)->dev.of_node);
        /* Firmware console speed is limited to 150-->38400 baud so
         * this hackish cflag thing is OK.
@@ -1408,7 +1408,7 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m
        int keyboard_mouse = 0;
        int err;
-        if (of_find_property(op->node, "keyboard", NULL))
+        if (of_find_property(op->dev.of_node, "keyboard", NULL))
                keyboard_mouse = 1;
        /* uarts must come before keyboards/mice */
@@ -1465,7 +1465,7 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m
        sunzilog_init_hw(&up[1]);
        if (!keyboard_mouse) {
-                if (sunserial_console_match(SUNZILOG_CONSOLE(), op->node,
+                if (sunserial_console_match(SUNZILOG_CONSOLE(), op->dev.of_node,
                                            &sunzilog_reg, up[0].port.line,
                                            false))
                        up->flags |= SUNZILOG_FLAG_IS_CONS;
@@ -1475,7 +1475,7 @@ static int __devinit zs_probe(struct of_device *op, const struct of_device_id *m
                                   rp, sizeof(struct zilog_layout));
                        return err;
                }
-                if (sunserial_console_match(SUNZILOG_CONSOLE(), op->node,
+                if (sunserial_console_match(SUNZILOG_CONSOLE(), op->dev.of_node,
                                            &sunzilog_reg, up[1].port.line,
                                            false))
                        up->flags |= SUNZILOG_FLAG_IS_CONS;
@@ -1541,8 +1541,11 @@ static const struct of_device_id zs_match[] = {
 MODULE_DEVICE_TABLE(of, zs_match);
 static struct of_platform_driver zs_driver = {
-        .name           = "zs",
+        .driver = {
-        .match_table    = zs_match,
+                .name = "zs",
+                .owner = THIS_MODULE,
+                .of_match_table = zs_match,
+        },
        .probe          = zs_probe,
        .remove         = __devexit_p(zs_remove),
 };
diff --git a/drivers/serial/uartlite.c b/drivers/serial/uartlite.c
index e6639a95d27..8acccd56437 100644
--- a/drivers/serial/uartlite.c
+++ b/drivers/serial/uartlite.c
@@ -591,15 +591,15 @@ ulite_of_probe(struct of_device *op, const struct of_device_id *match)
        dev_dbg(&op->dev, "%s(%p, %p)\n", __func__, op, match);
-        rc = of_address_to_resource(op->node, 0, &res);
+        rc = of_address_to_resource(op->dev.of_node, 0, &res);
        if (rc) {
                dev_err(&op->dev, "invalid address\n");
                return rc;
        }
-        irq = irq_of_parse_and_map(op->node, 0);
+        irq = irq_of_parse_and_map(op->dev.of_node, 0);
-        id = of_get_property(op->node, "port-number", NULL);
+        id = of_get_property(op->dev.of_node, "port-number", NULL);
        return ulite_assign(&op->dev, id ? *id : -1, res.start, irq);
 }
@@ -610,13 +610,12 @@ static int __devexit ulite_of_remove(struct of_device *op)
 }
 static struct of_platform_driver ulite_of_driver = {
-        .owner = THIS_MODULE,
-        .name = "uartlite",
-        .match_table = ulite_of_match,
        .probe = ulite_of_probe,
        .remove = __devexit_p(ulite_of_remove),
        .driver = {
                .name = "uartlite",
+                .owner = THIS_MODULE,
+                .of_match_table = ulite_of_match,
        },
 };
diff --git a/drivers/serial/ucc_uart.c b/drivers/serial/ucc_uart.c
index 074904912f6..907b06f5c44 100644
--- a/drivers/serial/ucc_uart.c
+++ b/drivers/serial/ucc_uart.c
@@ -1197,7 +1197,7 @@ static void uart_firmware_cont(const struct firmware *fw, void *context)
 static int ucc_uart_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;
        const unsigned int *iprop;      /* Integer OF properties */
        const char *sprop;      /* String OF properties */
        struct uart_qe_port *qe_port = NULL;
@@ -1486,9 +1486,11 @@ static struct of_device_id ucc_uart_match[] = {
 MODULE_DEVICE_TABLE(of, ucc_uart_match);
 static struct of_platform_driver ucc_uart_of_driver = {
-        .owner          = THIS_MODULE,
+        .driver = {
-        .name           = "ucc_uart",
+                .name = "ucc_uart",
-        .match_table    = ucc_uart_match,
+                .owner = THIS_MODULE,
+                .of_match_table    = ucc_uart_match,
+        },
        .probe          = ucc_uart_probe,
        .remove         = ucc_uart_remove,
 };
diff --git a/drivers/spi/mpc52xx_psc_spi.c b/drivers/spi/mpc52xx_psc_spi.c
index 77d4cc88ede..7104cb739da 100644
--- a/drivers/spi/mpc52xx_psc_spi.c
+++ b/drivers/spi/mpc52xx_psc_spi.c
@@ -472,18 +472,18 @@ static int __init mpc52xx_psc_spi_of_probe(struct of_device *op,
        s16 id = -1;
        int rc;
-        regaddr_p = of_get_address(op->node, 0, &size64, NULL);
+        regaddr_p = of_get_address(op->dev.of_node, 0, &size64, NULL);
        if (!regaddr_p) {
                dev_err(&op->dev, "Invalid PSC address\n");
                return -EINVAL;
        }
-        regaddr64 = of_translate_address(op->node, regaddr_p);
+        regaddr64 = of_translate_address(op->dev.of_node, regaddr_p);
        /* get PSC id (1..6, used by port_config) */
        if (op->dev.platform_data == NULL) {
                const u32 *psc_nump;
-                psc_nump = of_get_property(op->node, "cell-index", NULL);
+                psc_nump = of_get_property(op->dev.of_node, "cell-index", NULL);
                if (!psc_nump || *psc_nump > 5) {
                        dev_err(&op->dev, "Invalid cell-index property\n");
                        return -EINVAL;
@@ -492,9 +492,10 @@ static int __init mpc52xx_psc_spi_of_probe(struct of_device *op,
        }
        rc = mpc52xx_psc_spi_do_probe(&op->dev, (u32)regaddr64, (u32)size64,
-                                        irq_of_parse_and_map(op->node, 0), id);
+                                irq_of_parse_and_map(op->dev.of_node, 0), id);
        if (rc == 0)
-                of_register_spi_devices(dev_get_drvdata(&op->dev), op->node);
+                of_register_spi_devices(dev_get_drvdata(&op->dev),
+                                        op->dev.of_node);
        return rc;
 }
@@ -513,14 +514,12 @@ static const struct of_device_id mpc52xx_psc_spi_of_match[] = {
 MODULE_DEVICE_TABLE(of, mpc52xx_psc_spi_of_match);
 static struct of_platform_driver mpc52xx_psc_spi_of_driver = {
-        .owner = THIS_MODULE,
-        .name = "mpc52xx-psc-spi",
-        .match_table = mpc52xx_psc_spi_of_match,
        .probe = mpc52xx_psc_spi_of_probe,
        .remove = __exit_p(mpc52xx_psc_spi_of_remove),
        .driver = {
                .name = "mpc52xx-psc-spi",
                .owner = THIS_MODULE,
+                .of_match_table = mpc52xx_psc_spi_of_match,
        },
 };
diff --git a/drivers/spi/mpc52xx_spi.c b/drivers/spi/mpc52xx_spi.c
index cd68f1ce5cc..b1a76bff775 100644
--- a/drivers/spi/mpc52xx_spi.c
+++ b/drivers/spi/mpc52xx_spi.c
@@ -403,7 +403,7 @@ static int __devinit mpc52xx_spi_probe(struct of_device *op,
        /* MMIO registers */
        dev_dbg(&op->dev, "probing mpc5200 SPI device\n");
-        regs = of_iomap(op->node, 0);
+        regs = of_iomap(op->dev.of_node, 0);
        if (!regs)
                return -ENODEV;
@@ -445,11 +445,11 @@ static int __devinit mpc52xx_spi_probe(struct of_device *op,
        ms = spi_master_get_devdata(master);
        ms->master = master;
        ms->regs = regs;
-        ms->irq0 = irq_of_parse_and_map(op->node, 0);
+        ms->irq0 = irq_of_parse_and_map(op->dev.of_node, 0);
-        ms->irq1 = irq_of_parse_and_map(op->node, 1);
+        ms->irq1 = irq_of_parse_and_map(op->dev.of_node, 1);
        ms->state = mpc52xx_spi_fsmstate_idle;
-        ms->ipb_freq = mpc5xxx_get_bus_frequency(op->node);
+        ms->ipb_freq = mpc5xxx_get_bus_frequency(op->dev.of_node);
-        ms->gpio_cs_count = of_gpio_count(op->node);
+        ms->gpio_cs_count = of_gpio_count(op->dev.of_node);
        if (ms->gpio_cs_count > 0) {
                master->num_chipselect = ms->gpio_cs_count;
                ms->gpio_cs = kmalloc(ms->gpio_cs_count * sizeof(unsigned int),
@@ -460,7 +460,7 @@ static int __devinit mpc52xx_spi_probe(struct of_device *op,
                }
                for (i = 0; i < ms->gpio_cs_count; i++) {
-                        gpio_cs = of_get_gpio(op->node, i);
+                        gpio_cs = of_get_gpio(op->dev.of_node, i);
                        if (gpio_cs < 0) {
                                dev_err(&op->dev,
                                        "could not parse the gpio field "
@@ -512,7 +512,7 @@ static int __devinit mpc52xx_spi_probe(struct of_device *op,
        if (rc)
                goto err_register;
-        of_register_spi_devices(master, op->node);
+        of_register_spi_devices(master, op->dev.of_node);
        dev_info(&ms->master->dev, "registered MPC5200 SPI bus\n");
        return rc;
@@ -558,9 +558,11 @@ static const struct of_device_id mpc52xx_spi_match[] __devinitconst = {
 MODULE_DEVICE_TABLE(of, mpc52xx_spi_match);
 static struct of_platform_driver mpc52xx_spi_of_driver = {
-        .owner = THIS_MODULE,
+        .driver = {
-        .name = "mpc52xx-spi",
+                .name = "mpc52xx-spi",
-        .match_table = mpc52xx_spi_match,
+                .owner = THIS_MODULE,
+                .of_match_table = mpc52xx_spi_match,
+        },
        .probe = mpc52xx_spi_probe,
        .remove = __exit_p(mpc52xx_spi_remove),
 };
diff --git a/drivers/spi/spi_mpc8xxx.c b/drivers/spi/spi_mpc8xxx.c
index e324627d97a..75b7f8c0bab 100644
--- a/drivers/spi/spi_mpc8xxx.c
+++ b/drivers/spi/spi_mpc8xxx.c
@@ -797,7 +797,7 @@ static void mpc8xxx_spi_free_dummy_rx(void)
 static unsigned long mpc8xxx_spi_cpm_get_pram(struct mpc8xxx_spi *mspi)
 {
        struct device *dev = mspi->dev;
-        struct device_node *np = dev_archdata_get_node(&dev->archdata);
+        struct device_node *np = dev->of_node;
        const u32 *iprop;
        int size;
        unsigned long spi_base_ofs;
@@ -851,7 +851,7 @@ static unsigned long mpc8xxx_spi_cpm_get_pram(struct mpc8xxx_spi *mspi)
 static int mpc8xxx_spi_cpm_init(struct mpc8xxx_spi *mspi)
 {
        struct device *dev = mspi->dev;
-        struct device_node *np = dev_archdata_get_node(&dev->archdata);
+        struct device_node *np = dev->of_node;
        const u32 *iprop;
        int size;
        unsigned long pram_ofs;
@@ -1123,7 +1123,7 @@ static void mpc8xxx_spi_cs_control(struct spi_device *spi, bool on)
 static int of_mpc8xxx_spi_get_chipselects(struct device *dev)
 {
-        struct device_node *np = dev_archdata_get_node(&dev->archdata);
+        struct device_node *np = dev->of_node;
        struct fsl_spi_platform_data *pdata = dev->platform_data;
        struct mpc8xxx_spi_probe_info *pinfo = to_of_pinfo(pdata);
        unsigned int ngpios;
@@ -1224,7 +1224,7 @@ static int __devinit of_mpc8xxx_spi_probe(struct of_device *ofdev,
                                          const struct of_device_id *ofid)
 {
        struct device *dev = &ofdev->dev;
-        struct device_node *np = ofdev->node;
+        struct device_node *np = ofdev->dev.of_node;
        struct mpc8xxx_spi_probe_info *pinfo;
        struct fsl_spi_platform_data *pdata;
        struct spi_master *master;
@@ -1312,8 +1312,11 @@ static const struct of_device_id of_mpc8xxx_spi_match[] = {
 MODULE_DEVICE_TABLE(of, of_mpc8xxx_spi_match);
 static struct of_platform_driver of_mpc8xxx_spi_driver = {
-        .name           = "mpc8xxx_spi",
+        .driver = {
-        .match_table    = of_mpc8xxx_spi_match,
+                .name = "mpc8xxx_spi",
+                .owner = THIS_MODULE,
+                .of_match_table = of_mpc8xxx_spi_match,
+        },
        .probe          = of_mpc8xxx_spi_probe,
        .remove         = __devexit_p(of_mpc8xxx_spi_remove),
 };
diff --git a/drivers/spi/spi_ppc4xx.c b/drivers/spi/spi_ppc4xx.c
index 7cb5ff37f6e..19c0b3b34fc 100644
--- a/drivers/spi/spi_ppc4xx.c
+++ b/drivers/spi/spi_ppc4xx.c
@@ -587,12 +587,12 @@ static const struct of_device_id spi_ppc4xx_of_match[] = {
 MODULE_DEVICE_TABLE(of, spi_ppc4xx_of_match);
 static struct of_platform_driver spi_ppc4xx_of_driver = {
-        .match_table = spi_ppc4xx_of_match,
        .probe = spi_ppc4xx_of_probe,
        .remove = __exit_p(spi_ppc4xx_of_remove),
        .driver = {
                .name = DRIVER_NAME,
                .owner = THIS_MODULE,
+                .of_match_table = spi_ppc4xx_of_match,
        },
 };
diff --git a/drivers/spi/xilinx_spi_of.c b/drivers/spi/xilinx_spi_of.c
index 748d33a76d2..55c58012a02 100644
--- a/drivers/spi/xilinx_spi_of.c
+++ b/drivers/spi/xilinx_spi_of.c
@@ -109,12 +109,12 @@ static const struct of_device_id xilinx_spi_of_match[] = {
 MODULE_DEVICE_TABLE(of, xilinx_spi_of_match);
 static struct of_platform_driver xilinx_spi_of_driver = {
-        .match_table = xilinx_spi_of_match,
        .probe = xilinx_spi_of_probe,
        .remove = __exit_p(xilinx_spi_of_remove),
        .driver = {
                .name = "xilinx-xps-spi",
                .owner = THIS_MODULE,
+                .of_match_table = xilinx_spi_of_match,
        },
 };
diff --git a/drivers/usb/gadget/fsl_qe_udc.c b/drivers/usb/gadget/fsl_qe_udc.c
index 3537d51073b..2928523268b 100644
--- a/drivers/usb/gadget/fsl_qe_udc.c
+++ b/drivers/usb/gadget/fsl_qe_udc.c
@@ -2768,8 +2768,11 @@ static const struct of_device_id qe_udc_match[] __devinitconst = {
 MODULE_DEVICE_TABLE(of, qe_udc_match);
 static struct of_platform_driver udc_driver = {
-        .name           = (char *)driver_name,
+        .driver = {
-        .match_table    = qe_udc_match,
+                .name = (char *)driver_name,
+                .owner = THIS_MODULE,
+                .of_match_table = qe_udc_match,
+        },
        .probe          = qe_udc_probe,
        .remove         = __devexit_p(qe_udc_remove),
 #ifdef CONFIG_PM
diff --git a/drivers/usb/host/ehci-ppc-of.c b/drivers/usb/host/ehci-ppc-of.c
index 8df33b8a634..5aec92866ab 100644
--- a/drivers/usb/host/ehci-ppc-of.c
+++ b/drivers/usb/host/ehci-ppc-of.c
@@ -108,7 +108,7 @@ ppc44x_enable_bmt(struct device_node *dn)
 static int __devinit
 ehci_hcd_ppc_of_probe(struct of_device *op, const struct of_device_id *match)
 {
-        struct device_node *dn = op->node;
+        struct device_node *dn = op->dev.of_node;
        struct usb_hcd *hcd;
        struct ehci_hcd *ehci = NULL;
        struct resource res;
@@ -274,13 +274,12 @@ MODULE_DEVICE_TABLE(of, ehci_hcd_ppc_of_match);
 static struct of_platform_driver ehci_hcd_ppc_of_driver = {
-        .name           = "ppc-of-ehci",
-        .match_table    = ehci_hcd_ppc_of_match,
        .probe          = ehci_hcd_ppc_of_probe,
        .remove         = ehci_hcd_ppc_of_remove,
        .shutdown       = ehci_hcd_ppc_of_shutdown,
-        .driver         = {
+        .driver = {
-                .name   = "ppc-of-ehci",
+                .name = "ppc-of-ehci",
-                .owner  = THIS_MODULE,
+                .owner = THIS_MODULE,
+                .of_match_table = ehci_hcd_ppc_of_match,
        },
 };
diff --git a/drivers/usb/host/ehci-xilinx-of.c b/drivers/usb/host/ehci-xilinx-of.c
index f603bb2c0a8..013972bbde5 100644
--- a/drivers/usb/host/ehci-xilinx-of.c
+++ b/drivers/usb/host/ehci-xilinx-of.c
@@ -288,13 +288,12 @@ static const struct of_device_id ehci_hcd_xilinx_of_match[] = {
 MODULE_DEVICE_TABLE(of, ehci_hcd_xilinx_of_match);
 static struct of_platform_driver ehci_hcd_xilinx_of_driver = {
-        .name           = "xilinx-of-ehci",
-        .match_table    = ehci_hcd_xilinx_of_match,
        .probe          = ehci_hcd_xilinx_of_probe,
        .remove         = ehci_hcd_xilinx_of_remove,
        .shutdown       = ehci_hcd_xilinx_of_shutdown,
-        .driver         = {
+        .driver = {
-                .name   = "xilinx-of-ehci",
+                .name = "xilinx-of-ehci",
-                .owner  = THIS_MODULE,
+                .owner = THIS_MODULE,
+                .of_match_table = ehci_hcd_xilinx_of_match,
        },
 };
diff --git a/drivers/usb/host/fhci-hcd.c b/drivers/usb/host/fhci-hcd.c
index 90453379a43..c7c8392a88b 100644
--- a/drivers/usb/host/fhci-hcd.c
+++ b/drivers/usb/host/fhci-hcd.c
@@ -565,7 +565,7 @@ static int __devinit of_fhci_probe(struct of_device *ofdev,
                                   const struct of_device_id *ofid)
 {
        struct device *dev = &ofdev->dev;
-        struct device_node *node = ofdev->node;
+        struct device_node *node = dev->of_node;
        struct usb_hcd *hcd;
        struct fhci_hcd *fhci;
        struct resource usb_regs;
@@ -670,7 +670,7 @@ static int __devinit of_fhci_probe(struct of_device *ofdev,
        }
        for (j = 0; j < NUM_PINS; j++) {
-                fhci->pins[j] = qe_pin_request(ofdev->node, j);
+                fhci->pins[j] = qe_pin_request(node, j);
                if (IS_ERR(fhci->pins[j])) {
                        ret = PTR_ERR(fhci->pins[j]);
                        dev_err(dev, "can't get pin %d: %d\n", j, ret);
@@ -813,8 +813,11 @@ static const struct of_device_id of_fhci_match[] = {
 MODULE_DEVICE_TABLE(of, of_fhci_match);
 static struct of_platform_driver of_fhci_driver = {
-        .name           = "fsl,usb-fhci",
+        .driver = {
-        .match_table    = of_fhci_match,
+                .name = "fsl,usb-fhci",
+                .owner = THIS_MODULE,
+                .of_match_table = of_fhci_match,
+        },
        .probe          = of_fhci_probe,
        .remove         = __devexit_p(of_fhci_remove),
 };
diff --git a/drivers/usb/host/isp1760-if.c b/drivers/usb/host/isp1760-if.c
index 8f0259eaa2c..ec85d0c3cc3 100644
--- a/drivers/usb/host/isp1760-if.c
+++ b/drivers/usb/host/isp1760-if.c
@@ -31,7 +31,7 @@ static int of_isp1760_probe(struct of_device *dev,
                const struct of_device_id *match)
 {
        struct usb_hcd *hcd;
-        struct device_node *dp = dev->node;
+        struct device_node *dp = dev->dev.of_node;
        struct resource *res;
        struct resource memory;
        struct of_irq oirq;
@@ -120,8 +120,11 @@ static const struct of_device_id of_isp1760_match[] = {
 MODULE_DEVICE_TABLE(of, of_isp1760_match);
 static struct of_platform_driver isp1760_of_driver = {
-        .name           = "nxp-isp1760",
+        .driver = {
-        .match_table    = of_isp1760_match,
+                .name = "nxp-isp1760",
+                .owner = THIS_MODULE,
+                .of_match_table = of_isp1760_match,
+        },
        .probe          = of_isp1760_probe,
        .remove         = of_isp1760_remove,
 };
diff --git a/drivers/usb/host/ohci-ppc-of.c b/drivers/usb/host/ohci-ppc-of.c
index 103263c230c..df165917412 100644
--- a/drivers/usb/host/ohci-ppc-of.c
+++ b/drivers/usb/host/ohci-ppc-of.c
@@ -83,7 +83,7 @@ static const struct hc_driver ohci_ppc_of_hc_driver = {
 static int __devinit
 ohci_hcd_ppc_of_probe(struct of_device *op, const struct of_device_id *match)
 {
-        struct device_node *dn = op->node;
+        struct device_node *dn = op->dev.of_node;
        struct usb_hcd *hcd;
        struct ohci_hcd *ohci;
        struct resource res;
@@ -244,18 +244,13 @@ MODULE_DEVICE_TABLE(of, ohci_hcd_ppc_of_match);
 static struct of_platform_driver ohci_hcd_ppc_of_driver = {
-        .name           = "ppc-of-ohci",
-        .match_table    = ohci_hcd_ppc_of_match,
        .probe          = ohci_hcd_ppc_of_probe,
        .remove         = ohci_hcd_ppc_of_remove,
        .shutdown       = ohci_hcd_ppc_of_shutdown,
-#ifdef CONFIG_PM
+        .driver = {
-        /*.suspend      = ohci_hcd_ppc_soc_drv_suspend,*/
+                .name = "ppc-of-ohci",
-        /*.resume       = ohci_hcd_ppc_soc_drv_resume,*/
+                .owner = THIS_MODULE,
-#endif
+                .of_match_table = ohci_hcd_ppc_of_match,
-        .driver         = {
-                .name   = "ppc-of-ohci",
-                .owner  = THIS_MODULE,
        },
 };
diff --git a/drivers/video/bw2.c b/drivers/video/bw2.c
index 43320925c4c..2c371c07f0d 100644
--- a/drivers/video/bw2.c
+++ b/drivers/video/bw2.c
@@ -376,8 +376,11 @@ static const struct of_device_id bw2_match[] = {
 MODULE_DEVICE_TABLE(of, bw2_match);
 static struct of_platform_driver bw2_driver = {
-        .name           = "bw2",
+        .driver = {
-        .match_table    = bw2_match,
+                .name = "bw2",
+                .owner = THIS_MODULE,
+                .of_match_table = bw2_match,
+        },
        .probe          = bw2_probe,
        .remove         = __devexit_p(bw2_remove),
 };
diff --git a/drivers/video/cg14.c b/drivers/video/cg14.c
index 77a040af20a..d12e05b6e63 100644
--- a/drivers/video/cg14.c
+++ b/drivers/video/cg14.c
@@ -596,8 +596,11 @@ static const struct of_device_id cg14_match[] = {
 MODULE_DEVICE_TABLE(of, cg14_match);
 static struct of_platform_driver cg14_driver = {
-        .name           = "cg14",
+        .driver = {
-        .match_table    = cg14_match,
+                .name = "cg14",
+                .owner = THIS_MODULE,
+                .of_match_table = cg14_match,
+        },
        .probe          = cg14_probe,
        .remove         = __devexit_p(cg14_remove),
 };
diff --git a/drivers/video/cg3.c b/drivers/video/cg3.c
index 30eedf79322..b98f93f7f66 100644
--- a/drivers/video/cg3.c
+++ b/drivers/video/cg3.c
@@ -463,8 +463,11 @@ static const struct of_device_id cg3_match[] = {
 MODULE_DEVICE_TABLE(of, cg3_match);
 static struct of_platform_driver cg3_driver = {
-        .name           = "cg3",
+        .driver = {
-        .match_table    = cg3_match,
+                .name = "cg3",
+                .owner = THIS_MODULE,
+                .of_match_table = cg3_match,
+        },
        .probe          = cg3_probe,
        .remove         = __devexit_p(cg3_remove),
 };
diff --git a/drivers/video/cg6.c b/drivers/video/cg6.c
index 6d0fcb43696..480d761a27a 100644
--- a/drivers/video/cg6.c
+++ b/drivers/video/cg6.c
@@ -740,7 +740,7 @@ static void cg6_unmap_regs(struct of_device *op, struct fb_info *info,
 static int __devinit cg6_probe(struct of_device *op,
                                const struct of_device_id *match)
 {
-        struct device_node *dp = op->node;
+        struct device_node *dp = op->dev.of_node;
        struct fb_info *info;
        struct cg6_par *par;
        int linebytes, err;
@@ -856,8 +856,11 @@ static const struct of_device_id cg6_match[] = {
 MODULE_DEVICE_TABLE(of, cg6_match);
 static struct of_platform_driver cg6_driver = {
-        .name           = "cg6",
+        .driver = {
-        .match_table    = cg6_match,
+                .name = "cg6",
+                .owner = THIS_MODULE,
+                .of_match_table = cg6_match,
+        },
        .probe          = cg6_probe,
        .remove         = __devexit_p(cg6_remove),
 };
diff --git a/drivers/video/ffb.c b/drivers/video/ffb.c
index a42fabab69d..95c0227f47f 100644
--- a/drivers/video/ffb.c
+++ b/drivers/video/ffb.c
@@ -896,7 +896,7 @@ static void ffb_init_fix(struct fb_info *info)
 static int __devinit ffb_probe(struct of_device *op,
                               const struct of_device_id *match)
 {
-        struct device_node *dp = op->node;
+        struct device_node *dp = op->dev.of_node;
        struct ffb_fbc __iomem *fbc;
        struct ffb_dac __iomem *dac;
        struct fb_info *info;
@@ -1053,8 +1053,11 @@ static const struct of_device_id ffb_match[] = {
 MODULE_DEVICE_TABLE(of, ffb_match);
 static struct of_platform_driver ffb_driver = {
-        .name           = "ffb",
+        .driver = {
-        .match_table    = ffb_match,
+                .name = "ffb",
+                .owner = THIS_MODULE,
+                .of_match_table = ffb_match,
+        },
        .probe          = ffb_probe,
        .remove         = __devexit_p(ffb_remove),
 };
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index 994358a4f30..27455ce298b 100644
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -1421,7 +1421,7 @@ static ssize_t show_monitor(struct device *device,
 static int __devinit fsl_diu_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 mfb_info *mfbi;
        phys_addr_t dummy_ad_addr;
        int ret, i, error = 0;
@@ -1647,9 +1647,11 @@ static struct of_device_id fsl_diu_match[] = {
 MODULE_DEVICE_TABLE(of, fsl_diu_match);
 static struct of_platform_driver fsl_diu_driver = {
-        .owner          = THIS_MODULE,
+        .driver = {
-        .name           = "fsl_diu",
+                .name = "fsl_diu",
-        .match_table    = fsl_diu_match,
+                .owner = THIS_MODULE,
+                .of_match_table = fsl_diu_match,
+        },
        .probe          = fsl_diu_probe,
        .remove         = fsl_diu_remove,
        .suspend        = fsl_diu_suspend,
diff --git a/drivers/video/leo.c b/drivers/video/leo.c
index 1db55f12849..3d7895316ea 100644
--- a/drivers/video/leo.c
+++ b/drivers/video/leo.c
@@ -663,8 +663,11 @@ static const struct of_device_id leo_match[] = {
 MODULE_DEVICE_TABLE(of, leo_match);
 static struct of_platform_driver leo_driver = {
-        .name           = "leo",
+        .driver = {
-        .match_table    = leo_match,
+                .name = "leo",
+                .owner = THIS_MODULE,
+                .of_match_table = leo_match,
+        },
        .probe          = leo_probe,
        .remove         = __devexit_p(leo_remove),
 };
diff --git a/drivers/video/mb862xx/mb862xxfb.c b/drivers/video/mb862xx/mb862xxfb.c
index 8280a58a0e5..0540de4f5cb 100644
--- a/drivers/video/mb862xx/mb862xxfb.c
+++ b/drivers/video/mb862xx/mb862xxfb.c
@@ -718,9 +718,11 @@ static struct of_device_id __devinitdata of_platform_mb862xx_tbl[] = {
 };
 static struct of_platform_driver of_platform_mb862xxfb_driver = {
-        .owner          = THIS_MODULE,
+        .driver = {
-        .name           = DRV_NAME,
+                .name = DRV_NAME,
-        .match_table    = of_platform_mb862xx_tbl,
+                .owner = THIS_MODULE,
+                .of_match_table = of_platform_mb862xx_tbl,
+        },
        .probe          = of_platform_mb862xx_probe,
        .remove         = __devexit_p(of_platform_mb862xx_remove),
 };
diff --git a/drivers/video/p9100.c b/drivers/video/p9100.c
index 81440f2b909..c85dd408a9b 100644
--- a/drivers/video/p9100.c
+++ b/drivers/video/p9100.c
@@ -353,8 +353,11 @@ static const struct of_device_id p9100_match[] = {
 MODULE_DEVICE_TABLE(of, p9100_match);
 static struct of_platform_driver p9100_driver = {
-        .name           = "p9100",
+        .driver = {
-        .match_table    = p9100_match,
+                .name = "p9100",
+                .owner = THIS_MODULE,
+                .of_match_table = p9100_match,
+        },
        .probe          = p9100_probe,
        .remove         = __devexit_p(p9100_remove),
 };
diff --git a/drivers/video/platinumfb.c b/drivers/video/platinumfb.c
index 8a204e7a5b5..72a1f4c0473 100644
--- a/drivers/video/platinumfb.c
+++ b/drivers/video/platinumfb.c
@@ -536,7 +536,7 @@ static int __init platinumfb_setup(char *options)
 static int __devinit platinumfb_probe(struct of_device* odev,
                                      const struct of_device_id *match)
 {
-        struct device_node      *dp = odev->node;
+        struct device_node      *dp = odev->dev.of_node;
        struct fb_info          *info;
        struct fb_info_platinum *pinfo;
        volatile __u8           *fbuffer;
@@ -679,8 +679,11 @@ static struct of_device_id platinumfb_match[] =
 static struct of_platform_driver platinum_driver = 
 {
-        .name           = "platinumfb",
+        .driver = {
-        .match_table    = platinumfb_match,
+                .name = "platinumfb",
+                .owner = THIS_MODULE,
+                .of_match_table = platinumfb_match,
+        },
        .probe          = platinumfb_probe,
        .remove         = platinumfb_remove,
 };
diff --git a/drivers/video/sunxvr1000.c b/drivers/video/sunxvr1000.c
index 23e69e834a1..489b44e8db8 100644
--- a/drivers/video/sunxvr1000.c
+++ b/drivers/video/sunxvr1000.c
@@ -114,7 +114,7 @@ static int __devinit gfb_set_fbinfo(struct gfb_info *gp)
 static int __devinit gfb_probe(struct of_device *op,
                               const struct of_device_id *match)
 {
-        struct device_node *dp = op->node;
+        struct device_node *dp = op->dev.of_node;
        struct fb_info *info;
        struct gfb_info *gp;
        int err;
@@ -199,10 +199,13 @@ static const struct of_device_id gfb_match[] = {
 MODULE_DEVICE_TABLE(of, ffb_match);
 static struct of_platform_driver gfb_driver = {
-        .name           = "gfb",
-        .match_table    = gfb_match,
        .probe          = gfb_probe,
        .remove         = __devexit_p(gfb_remove),
+        .driver = {
+                .name           = "gfb",
+                .owner          = THIS_MODULE,
+                .of_match_table = gfb_match,
+        },
 };
 static int __init gfb_init(void)
diff --git a/drivers/video/tcx.c b/drivers/video/tcx.c
index c0c2b18fcdc..ef7a7bd8b50 100644
--- a/drivers/video/tcx.c
+++ b/drivers/video/tcx.c
@@ -512,8 +512,11 @@ static const struct of_device_id tcx_match[] = {
 MODULE_DEVICE_TABLE(of, tcx_match);
 static struct of_platform_driver tcx_driver = {
-        .name           = "tcx",
+        .driver = {
-        .match_table    = tcx_match,
+                .name = "tcx",
+                .owner = THIS_MODULE,
+                .of_match_table = tcx_match,
+        },
        .probe          = tcx_probe,
        .remove         = __devexit_p(tcx_remove),
 };
diff --git a/drivers/video/xilinxfb.c b/drivers/video/xilinxfb.c
index 3fcb83f0388..574dc54e12d 100644
--- a/drivers/video/xilinxfb.c
+++ b/drivers/video/xilinxfb.c
@@ -423,7 +423,7 @@ xilinxfb_of_probe(struct of_device *op, const struct of_device_id *match)
         * To check whether the core is connected directly to DCR or PLB
         * interface and initialize the tft_access accordingly.
         */
-        p = (u32 *)of_get_property(op->node, "xlnx,dcr-splb-slave-if", NULL);
+        p = (u32 *)of_get_property(op->dev.of_node, "xlnx,dcr-splb-slave-if", NULL);
        tft_access = p ? *p : 0;
        /*
@@ -432,41 +432,41 @@ xilinxfb_of_probe(struct of_device *op, const struct of_device_id *match)
         */
        if (tft_access) {
                drvdata->flags |= PLB_ACCESS_FLAG;
-                rc = of_address_to_resource(op->node, 0, &res);
+                rc = of_address_to_resource(op->dev.of_node, 0, &res);
                if (rc) {
                        dev_err(&op->dev, "invalid address\n");
                        goto err;
                }
        } else {
                res.start = 0;
-                start = dcr_resource_start(op->node, 0);
+                start = dcr_resource_start(op->dev.of_node, 0);
-                drvdata->dcr_len = dcr_resource_len(op->node, 0);
+                drvdata->dcr_len = dcr_resource_len(op->dev.of_node, 0);
-                drvdata->dcr_host = dcr_map(op->node, start, drvdata->dcr_len);
+                drvdata->dcr_host = dcr_map(op->dev.of_node, start, drvdata->dcr_len);
                if (!DCR_MAP_OK(drvdata->dcr_host)) {
                        dev_err(&op->dev, "invalid DCR address\n");
                        goto err;
                }
        }
-        prop = of_get_property(op->node, "phys-size", &size);
+        prop = of_get_property(op->dev.of_node, "phys-size", &size);
        if ((prop) && (size >= sizeof(u32)*2)) {
                pdata.screen_width_mm = prop[0];
                pdata.screen_height_mm = prop[1];
        }
-        prop = of_get_property(op->node, "resolution", &size);
+        prop = of_get_property(op->dev.of_node, "resolution", &size);
        if ((prop) && (size >= sizeof(u32)*2)) {
                pdata.xres = prop[0];
                pdata.yres = prop[1];
        }
-        prop = of_get_property(op->node, "virtual-resolution", &size);
+        prop = of_get_property(op->dev.of_node, "virtual-resolution", &size);
        if ((prop) && (size >= sizeof(u32)*2)) {
                pdata.xvirt = prop[0];
                pdata.yvirt = prop[1];
        }
-        if (of_find_property(op->node, "rotate-display", NULL))
+        if (of_find_property(op->dev.of_node, "rotate-display", NULL))
                pdata.rotate_screen = 1;
        dev_set_drvdata(&op->dev, drvdata);
@@ -492,13 +492,12 @@ static struct of_device_id xilinxfb_of_match[] __devinitdata = {
 MODULE_DEVICE_TABLE(of, xilinxfb_of_match);
 static struct of_platform_driver xilinxfb_of_driver = {
-        .owner = THIS_MODULE,
-        .name = DRIVER_NAME,
-        .match_table = xilinxfb_of_match,
        .probe = xilinxfb_of_probe,
        .remove = __devexit_p(xilinxfb_of_remove),
        .driver = {
                .name = DRIVER_NAME,
+                .owner = THIS_MODULE,
+                .of_match_table = xilinxfb_of_match,
        },
 };
diff --git a/drivers/watchdog/cpwd.c b/drivers/watchdog/cpwd.c
index ba2efce4b40..d62b9ce8f77 100644
--- a/drivers/watchdog/cpwd.c
+++ b/drivers/watchdog/cpwd.c
@@ -577,7 +577,7 @@ static int __devinit cpwd_probe(struct of_device *op,
         * interrupt_mask register cannot be written, so no timer
         * interrupts can be masked within the PLD.
         */
-        str_prop = of_get_property(op->node, "model", NULL);
+        str_prop = of_get_property(op->dev.of_node, "model", NULL);
        p->broken = (str_prop && !strcmp(str_prop, WD_BADMODEL));
        if (!p->enabled)
@@ -677,8 +677,11 @@ static const struct of_device_id cpwd_match[] = {
 MODULE_DEVICE_TABLE(of, cpwd_match);
 static struct of_platform_driver cpwd_driver = {
-        .name           = DRIVER_NAME,
+        .driver = {
-        .match_table    = cpwd_match,
+                .name = DRIVER_NAME,
+                .owner = THIS_MODULE,
+                .of_match_table = cpwd_match,
+        },
        .probe          = cpwd_probe,
        .remove         = __devexit_p(cpwd_remove),
 };
diff --git a/drivers/watchdog/gef_wdt.c b/drivers/watchdog/gef_wdt.c
index abdbad034a6..ca0f4c6cf5a 100644
--- a/drivers/watchdog/gef_wdt.c
+++ b/drivers/watchdog/gef_wdt.c
@@ -303,9 +303,11 @@ static const struct of_device_id gef_wdt_ids[] = {
 };
 static struct of_platform_driver gef_wdt_driver = {
-        .owner          = THIS_MODULE,
+        .driver = {
-        .name           = "gef_wdt",
+                .name = "gef_wdt",
-        .match_table    = gef_wdt_ids,
+                .owner = THIS_MODULE,
+                .of_match_table = gef_wdt_ids,
+        },
        .probe          = gef_wdt_probe,
 };
diff --git a/drivers/watchdog/mpc8xxx_wdt.c b/drivers/watchdog/mpc8xxx_wdt.c
index 4e3941c5e29..7b55974191d 100644
--- a/drivers/watchdog/mpc8xxx_wdt.c
+++ b/drivers/watchdog/mpc8xxx_wdt.c
@@ -273,12 +273,12 @@ static const struct of_device_id mpc8xxx_wdt_match[] = {
 MODULE_DEVICE_TABLE(of, mpc8xxx_wdt_match);
 static struct of_platform_driver mpc8xxx_wdt_driver = {
-        .match_table    = mpc8xxx_wdt_match,
        .probe          = mpc8xxx_wdt_probe,
        .remove         = __devexit_p(mpc8xxx_wdt_remove),
-        .driver         = {
+        .driver = {
-                .name   = "mpc8xxx_wdt",
+                .name = "mpc8xxx_wdt",
-                .owner  = THIS_MODULE,
+                .owner = THIS_MODULE,
+                .of_match_table = mpc8xxx_wdt_match,
        },
 };
diff --git a/drivers/watchdog/riowd.c b/drivers/watchdog/riowd.c
index ea7f803f624..5dceeddc885 100644
--- a/drivers/watchdog/riowd.c
+++ b/drivers/watchdog/riowd.c
@@ -239,8 +239,11 @@ static const struct of_device_id riowd_match[] = {
 MODULE_DEVICE_TABLE(of, riowd_match);
 static struct of_platform_driver riowd_driver = {
-        .name           = DRIVER_NAME,
+        .driver = {
-        .match_table    = riowd_match,
+                .name = DRIVER_NAME,
+                .owner = THIS_MODULE,
+                .of_match_table = riowd_match,
+        },
        .probe          = riowd_probe,
        .remove         = __devexit_p(riowd_remove),
 };