- patches.arch/x86_mce_intel_decode_physical_address.patch:

[linux-flexiantxendom0-3.2.10.git] / arch / sparc / kernel / chmc.c

diff --git a/arch/sparc/kernel/chmc.c b/arch/sparc/kernel/chmc.c
index fb6801c..870cb65 100644 (file)
--- a/arch/sparc/kernel/chmc.c
+++ b/arch/sparc/kernel/chmc.c
@@ -425,7 +425,7 @@ static int __devinit jbusmc_probe(struct of_device *op,
        INIT_LIST_HEAD(&p->list);
 
        err = -ENODEV;
-       prop = of_get_property(op->node, "portid", &len);
+       prop = of_get_property(op->dev.of_node, "portid", &len);
        if (!prop || len != 4) {
                printk(KERN_ERR PFX "Cannot find portid.\n");
                goto out_free;
@@ -433,7 +433,7 @@ static int __devinit jbusmc_probe(struct of_device *op,
 
        p->portid = *prop;
 
-       prop = of_get_property(op->node, "memory-control-register-1", &len);
+       prop = of_get_property(op->dev.of_node, "memory-control-register-1", &len);
        if (!prop || len != 8) {
                printk(KERN_ERR PFX "Cannot get memory control register 1.\n");
                goto out_free;
@@ -449,7 +449,7 @@ static int __devinit jbusmc_probe(struct of_device *op,
        }
 
        err = -ENODEV;
-       ml = of_get_property(op->node, "memory-layout", &p->layout_len);
+       ml = of_get_property(op->dev.of_node, "memory-layout", &p->layout_len);
        if (!ml) {
                printk(KERN_ERR PFX "Cannot get memory layout property.\n");
                goto out_iounmap;
@@ -466,7 +466,7 @@ static int __devinit jbusmc_probe(struct of_device *op,
        mc_list_add(&p->list);
 
        printk(KERN_INFO PFX "UltraSPARC-IIIi memory controller at %s\n",
-              op->node->full_name);
+              op->dev.of_node->full_name);
 
        dev_set_drvdata(&op->dev, p);
 
@@ -693,7 +693,7 @@ static void chmc_fetch_decode_regs(struct chmc *p)
 static int __devinit chmc_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;
        unsigned long ver;
        const void *pval;
        int len, portid;
@@ -811,9 +811,11 @@ static const struct of_device_id us3mc_match[] = {
 MODULE_DEVICE_TABLE(of, us3mc_match);
 
 static struct of_platform_driver us3mc_driver = {
-       .owner          = THIS_MODULE,
-       .name           = "us3mc",
-       .match_table    = us3mc_match,
+       .driver = {
+               .name = "us3mc",
+               .owner = THIS_MODULE,
+               .of_match_table = us3mc_match,
+       },
        .probe          = us3mc_probe,
        .remove         = __devexit_p(us3mc_remove),
 };