3 files changed, 17 insertions, 16 deletions

diff --git a/drivers/spi/mpc52xx_psc_spi.c b/drivers/spi/mpc52xx_psc_spi.c
index 77d4cc88ede..7fcf2840586 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;
 }
diff --git a/drivers/spi/mpc52xx_spi.c b/drivers/spi/mpc52xx_spi.c
index cd68f1ce5cc..6573233bf7c 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->irq1 = irq_of_parse_and_map(op->node, 1);
+        ms->irq0 = irq_of_parse_and_map(op->dev.of_node, 0);
+        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->gpio_cs_count = of_gpio_count(op->node);
+        ms->ipb_freq = mpc5xxx_get_bus_frequency(op->dev.of_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;
diff --git a/drivers/spi/spi_mpc8xxx.c b/drivers/spi/spi_mpc8xxx.c
index 14d05231650..7572f98a419 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;