Merge branches 'bugzilla-14668' and 'misc-2.6.35' into release

1 files changed, 16 insertions, 16 deletions

diff --git a/drivers/i2c/busses/i2c-cpm.c b/drivers/i2c/busses/i2c-cpm.c
index 9c2e10082b7..b02b4533651 100644
--- a/drivers/i2c/busses/i2c-cpm.c
+++ b/drivers/i2c/busses/i2c-cpm.c
@@ -440,8 +440,8 @@ 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);
-        if (cpm->irq == NO_IRQ)
+        cpm->irq = of_irq_to_resource(ofdev->dev.of_node, 0, NULL);
+        if (!cpm->irq)
                 return -EINVAL;
 
         /* Install interrupt handler. */
@@ -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         = {
-                .name   = "fsl-i2c-cpm",
-                .owner  = THIS_MODULE,
-        }
+        .driver = {
+                .name = "fsl-i2c-cpm",
+                .owner = THIS_MODULE,
+                .of_match_table = cpm_i2c_match,
+        },
 };
 
 static int __init cpm_i2c_init(void)