of: Always use 'struct device.of_node' to get device node pointer.

[safe/jmp/linux-2.6] / drivers / macintosh / macio_asic.c

diff --git a/drivers/macintosh/macio_asic.c b/drivers/macintosh/macio_asic.c
index 26a303a..67fe13f 100644 (file)
--- a/drivers/macintosh/macio_asic.c
+++ b/drivers/macintosh/macio_asic.c
@@ -248,7 +248,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 +289,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 +317,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,7 +373,7 @@ 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.dev.dma_mask = &dev->ofdev.dma_mask;
        dev->ofdev.dev.parent = parent;
@@ -494,9 +494,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))
-                            != NULL;) {
+               for (np = NULL; (np = of_get_next_child(pnode, np)) != NULL;) {
                        if (macio_skip_device(np))
                                continue;
                        of_node_get(np);
@@ -506,9 +506,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))
-                            != NULL;) {
+               for (np = NULL; (np = of_get_next_child(pnode, np)) != NULL;) {
                        if (macio_skip_device(np))
                                continue;
                        of_node_get(np);