of: Always use 'struct device.of_node' to get device node pointer.
[safe/jmp/linux-2.6] / arch / powerpc / sysdev / axonram.c
index 88f4ae7..88b21fc 100644 (file)
@@ -185,7 +185,7 @@ axon_ram_probe(struct of_device *device, const struct of_device_id *device_id)
        axon_ram_bank_id++;
 
        dev_info(&device->dev, "Found memory controller on %s\n",
-                       device->node->full_name);
+                       device->dev.of_node->full_name);
 
        bank = kzalloc(sizeof(struct axon_ram_bank), GFP_KERNEL);
        if (bank == NULL) {
@@ -198,7 +198,7 @@ axon_ram_probe(struct of_device *device, const struct of_device_id *device_id)
 
        bank->device = device;
 
-       if (of_address_to_resource(device->node, 0, &resource) != 0) {
+       if (of_address_to_resource(device->dev.of_node, 0, &resource) != 0) {
                dev_err(&device->dev, "Cannot access device tree\n");
                rc = -EFAULT;
                goto failed;
@@ -253,7 +253,7 @@ axon_ram_probe(struct of_device *device, const struct of_device_id *device_id)
        blk_queue_logical_block_size(bank->disk->queue, AXON_RAM_SECTOR_SIZE);
        add_disk(bank->disk);
 
-       bank->irq_id = irq_of_parse_and_map(device->node, 0);
+       bank->irq_id = irq_of_parse_and_map(device->dev.of_node, 0);
        if (bank->irq_id == NO_IRQ) {
                dev_err(&device->dev, "Cannot access ECC interrupt ID\n");
                rc = -EFAULT;